diff --git a/AppController.m b/AppController.m index 049e7d7ad..25390f697 100644 --- a/AppController.m +++ b/AppController.m @@ -50,7 +50,6 @@ - (void)awakeFromNib { // DBLog(@"AWAKe"); - [playButton setToolTip:NSLocalizedString(@"PlayButtonTooltip", @"")]; [stopButton setToolTip:NSLocalizedString(@"StopButtonTooltip", @"")]; [prevButton setToolTip:NSLocalizedString(@"PrevButtonTooltip", @"")]; diff --git a/Changelog b/Changelog index 445e9a4bd..53b8be3b0 100644 --- a/Changelog +++ b/Changelog @@ -1,3 +1,7 @@ +0.05 +---- +Wavpack length should be reported correctly. + 0.05 alpha 6 ----------- Updated libsndfile to 1.0.15 @@ -79,4 +83,4 @@ Misc UI fixes. 0.01 ----- -Initial release. \ No newline at end of file +Initial release. diff --git a/Cog.xcodeproj/project.pbxproj b/Cog.xcodeproj/project.pbxproj index 1528ace05..16f5203b0 100644 --- a/Cog.xcodeproj/project.pbxproj +++ b/Cog.xcodeproj/project.pbxproj @@ -11,6 +11,10 @@ 8D11072B0486CEB800E47090 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 089C165CFE840E0CC02AAC07 /* InfoPlist.strings */; }; 8D11072D0486CEB800E47090 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 29B97316FDCFA39411CA2CEA /* main.m */; settings = {ATTRIBUTES = (); }; }; 8D11072F0486CEB800E47090 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */; }; + 8E30EF600A025FED00E45631 /* RoundBackgroundCell.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 8E30EF5E0A025FED00E45631 /* RoundBackgroundCell.h */; }; + 8E30EF610A025FED00E45631 /* RoundBackgroundCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 8E30EF5F0A025FED00E45631 /* RoundBackgroundCell.m */; }; + 8E30EF640A025FFC00E45631 /* RoundBackgroundField.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 8E30EF620A025FFC00E45631 /* RoundBackgroundField.h */; }; + 8E30EF650A025FFC00E45631 /* RoundBackgroundField.m in Sources */ = {isa = PBXBuildFile; fileRef = 8E30EF630A025FFC00E45631 /* RoundBackgroundField.m */; }; 8E75756909F31D5A0080F1EE /* AppController.m in Sources */ = {isa = PBXBuildFile; fileRef = 8E75751909F31D5A0080F1EE /* AppController.m */; }; 8E75756A09F31D5A0080F1EE /* ClickField.m in Sources */ = {isa = PBXBuildFile; fileRef = 8E75751C09F31D5A0080F1EE /* ClickField.m */; }; 8E75756B09F31D5A0080F1EE /* InfoView.m in Sources */ = {isa = PBXBuildFile; fileRef = 8E75751E09F31D5A0080F1EE /* InfoView.m */; }; @@ -49,7 +53,6 @@ 8E75758D09F31D5A0080F1EE /* VirtualRingBuffer.m in Sources */ = {isa = PBXBuildFile; fileRef = 8E75756809F31D5A0080F1EE /* VirtualRingBuffer.m */; }; 8E7575A709F31D800080F1EE /* add_blue.png in Resources */ = {isa = PBXBuildFile; fileRef = 8E75758F09F31D800080F1EE /* add_blue.png */; }; 8E7575A809F31D800080F1EE /* add_gray.png in Resources */ = {isa = PBXBuildFile; fileRef = 8E75759009F31D800080F1EE /* add_gray.png */; }; - 8E7575A909F31D800080F1EE /* bground.png in Resources */ = {isa = PBXBuildFile; fileRef = 8E75759109F31D800080F1EE /* bground.png */; }; 8E7575AA09F31D800080F1EE /* info_blue.png in Resources */ = {isa = PBXBuildFile; fileRef = 8E75759209F31D800080F1EE /* info_blue.png */; }; 8E7575AB09F31D800080F1EE /* info_gray.png in Resources */ = {isa = PBXBuildFile; fileRef = 8E75759309F31D800080F1EE /* info_gray.png */; }; 8E7575AC09F31D800080F1EE /* next_blue.png in Resources */ = {isa = PBXBuildFile; fileRef = 8E75759409F31D800080F1EE /* next_blue.png */; }; @@ -66,8 +69,6 @@ 8E7575B709F31D800080F1EE /* repeat_on.png in Resources */ = {isa = PBXBuildFile; fileRef = 8E75759F09F31D800080F1EE /* repeat_on.png */; }; 8E7575B809F31D800080F1EE /* shuffle_off.png in Resources */ = {isa = PBXBuildFile; fileRef = 8E7575A009F31D800080F1EE /* shuffle_off.png */; }; 8E7575B909F31D800080F1EE /* shuffle_on.png in Resources */ = {isa = PBXBuildFile; fileRef = 8E7575A109F31D800080F1EE /* shuffle_on.png */; }; - 8E7575BA09F31D800080F1EE /* stop_blue.png in Resources */ = {isa = PBXBuildFile; fileRef = 8E7575A209F31D800080F1EE /* stop_blue.png */; }; - 8E7575BB09F31D800080F1EE /* stop_gray.png in Resources */ = {isa = PBXBuildFile; fileRef = 8E7575A309F31D800080F1EE /* stop_gray.png */; }; 8E7575BC09F31D800080F1EE /* volume_high.png in Resources */ = {isa = PBXBuildFile; fileRef = 8E7575A409F31D800080F1EE /* volume_high.png */; }; 8E7575BD09F31D800080F1EE /* volume_low.png in Resources */ = {isa = PBXBuildFile; fileRef = 8E7575A509F31D800080F1EE /* volume_low.png */; }; 8E7575BE09F31D800080F1EE /* wheel.icns in Resources */ = {isa = PBXBuildFile; fileRef = 8E7575A609F31D800080F1EE /* wheel.icns */; }; @@ -142,6 +143,8 @@ 8E757B5709F326710080F1EE /* OggFLAC.framework in CopyFiles */, 8E757B5809F326710080F1EE /* FAAD2.framework in CopyFiles */, 8E757B5909F326710080F1EE /* DecMPA.framework in CopyFiles */, + 8E30EF600A025FED00E45631 /* RoundBackgroundCell.h in CopyFiles */, + 8E30EF640A025FFC00E45631 /* RoundBackgroundField.h in CopyFiles */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -158,6 +161,10 @@ 32CA4F630368D1EE00C91783 /* Cog_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Cog_Prefix.pch; sourceTree = ""; }; 8D1107310486CEB800E47090 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist; path = Info.plist; sourceTree = ""; }; 8D1107320486CEB800E47090 /* Cog.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Cog.app; sourceTree = BUILT_PRODUCTS_DIR; }; + 8E30EF5E0A025FED00E45631 /* RoundBackgroundCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RoundBackgroundCell.h; sourceTree = ""; }; + 8E30EF5F0A025FED00E45631 /* RoundBackgroundCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RoundBackgroundCell.m; sourceTree = ""; }; + 8E30EF620A025FFC00E45631 /* RoundBackgroundField.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RoundBackgroundField.h; sourceTree = ""; }; + 8E30EF630A025FFC00E45631 /* RoundBackgroundField.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RoundBackgroundField.m; sourceTree = ""; }; 8E75751309F31D130080F1EE /* French */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = French; path = French.lproj/MainMenu.nib; sourceTree = ""; }; 8E75751809F31D5A0080F1EE /* AppController.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = AppController.h; sourceTree = ""; }; 8E75751909F31D5A0080F1EE /* AppController.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = AppController.m; sourceTree = ""; }; @@ -233,7 +240,6 @@ 8E75756809F31D5A0080F1EE /* VirtualRingBuffer.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = VirtualRingBuffer.m; sourceTree = ""; }; 8E75758F09F31D800080F1EE /* add_blue.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = add_blue.png; sourceTree = ""; }; 8E75759009F31D800080F1EE /* add_gray.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = add_gray.png; sourceTree = ""; }; - 8E75759109F31D800080F1EE /* bground.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = bground.png; sourceTree = ""; }; 8E75759209F31D800080F1EE /* info_blue.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = info_blue.png; sourceTree = ""; }; 8E75759309F31D800080F1EE /* info_gray.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = info_gray.png; sourceTree = ""; }; 8E75759409F31D800080F1EE /* next_blue.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = next_blue.png; sourceTree = ""; }; @@ -250,8 +256,6 @@ 8E75759F09F31D800080F1EE /* repeat_on.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = repeat_on.png; sourceTree = ""; }; 8E7575A009F31D800080F1EE /* shuffle_off.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = shuffle_off.png; sourceTree = ""; }; 8E7575A109F31D800080F1EE /* shuffle_on.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = shuffle_on.png; sourceTree = ""; }; - 8E7575A209F31D800080F1EE /* stop_blue.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = stop_blue.png; sourceTree = ""; }; - 8E7575A309F31D800080F1EE /* stop_gray.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = stop_gray.png; sourceTree = ""; }; 8E7575A409F31D800080F1EE /* volume_high.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = volume_high.png; sourceTree = ""; }; 8E7575A509F31D800080F1EE /* volume_low.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = volume_low.png; sourceTree = ""; }; 8E7575A609F31D800080F1EE /* wheel.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = wheel.icns; sourceTree = ""; }; @@ -414,6 +418,10 @@ 8E75752009F31D5A0080F1EE /* TrackingCell.m */, 8E75752109F31D5A0080F1EE /* TrackingSlider.h */, 8E75752209F31D5A0080F1EE /* TrackingSlider.m */, + 8E30EF5E0A025FED00E45631 /* RoundBackgroundCell.h */, + 8E30EF5F0A025FED00E45631 /* RoundBackgroundCell.m */, + 8E30EF620A025FFC00E45631 /* RoundBackgroundField.h */, + 8E30EF630A025FFC00E45631 /* RoundBackgroundField.m */, ); path = Custom; sourceTree = ""; @@ -526,7 +534,6 @@ children = ( 8E75758F09F31D800080F1EE /* add_blue.png */, 8E75759009F31D800080F1EE /* add_gray.png */, - 8E75759109F31D800080F1EE /* bground.png */, 8E75759209F31D800080F1EE /* info_blue.png */, 8E75759309F31D800080F1EE /* info_gray.png */, 8E75759409F31D800080F1EE /* next_blue.png */, @@ -543,8 +550,6 @@ 8E75759F09F31D800080F1EE /* repeat_on.png */, 8E7575A009F31D800080F1EE /* shuffle_off.png */, 8E7575A109F31D800080F1EE /* shuffle_on.png */, - 8E7575A209F31D800080F1EE /* stop_blue.png */, - 8E7575A309F31D800080F1EE /* stop_gray.png */, 8E7575A409F31D800080F1EE /* volume_high.png */, 8E7575A509F31D800080F1EE /* volume_low.png */, 8E7575A609F31D800080F1EE /* wheel.icns */, @@ -626,7 +631,6 @@ 8E75758709F31D5A0080F1EE /* SOUNDTODO in Resources */, 8E7575A709F31D800080F1EE /* add_blue.png in Resources */, 8E7575A809F31D800080F1EE /* add_gray.png in Resources */, - 8E7575A909F31D800080F1EE /* bground.png in Resources */, 8E7575AA09F31D800080F1EE /* info_blue.png in Resources */, 8E7575AB09F31D800080F1EE /* info_gray.png in Resources */, 8E7575AC09F31D800080F1EE /* next_blue.png in Resources */, @@ -643,8 +647,6 @@ 8E7575B709F31D800080F1EE /* repeat_on.png in Resources */, 8E7575B809F31D800080F1EE /* shuffle_off.png in Resources */, 8E7575B909F31D800080F1EE /* shuffle_on.png in Resources */, - 8E7575BA09F31D800080F1EE /* stop_blue.png in Resources */, - 8E7575BB09F31D800080F1EE /* stop_gray.png in Resources */, 8E7575BC09F31D800080F1EE /* volume_high.png in Resources */, 8E7575BD09F31D800080F1EE /* volume_low.png in Resources */, 8E7575BE09F31D800080F1EE /* wheel.icns in Resources */, @@ -703,6 +705,8 @@ 8E75758B09F31D5A0080F1EE /* DBLog.m in Sources */, 8E75758C09F31D5A0080F1EE /* Semaphore.m in Sources */, 8E75758D09F31D5A0080F1EE /* VirtualRingBuffer.m in Sources */, + 8E30EF610A025FED00E45631 /* RoundBackgroundCell.m in Sources */, + 8E30EF650A025FFC00E45631 /* RoundBackgroundField.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/Custom/ClickField.h b/Custom/ClickField.h index a6505e35b..e7183ac8f 100644 --- a/Custom/ClickField.h +++ b/Custom/ClickField.h @@ -1,10 +1,9 @@ /* ClickField */ #import -#import "SoundController.h" - -@interface ClickField : NSTextField +#import "RoundBackgroundField.h" +@interface ClickField : RoundBackgroundField { - IBOutlet SoundController *soundController; + } @end diff --git a/Custom/ClickField.m b/Custom/ClickField.m index 19005df37..52a74252a 100644 --- a/Custom/ClickField.m +++ b/Custom/ClickField.m @@ -8,8 +8,10 @@ - (void)mouseDown:(NSEvent *)theEvent { + NSLog(@"MOUSING DOWN"); if([theEvent type] == NSLeftMouseDown) { +// NSLog(@"SENDING ACTION: %@", [self action]); [self sendAction:[self action] to:[self target]]; } } diff --git a/Custom/RoundBackgroundCell.h b/Custom/RoundBackgroundCell.h new file mode 100644 index 000000000..21a4e9503 --- /dev/null +++ b/Custom/RoundBackgroundCell.h @@ -0,0 +1,16 @@ +// +// RoundBackgroundCell.h +// Cog +// +// Created by Zaphod Beeblebrox on 4/28/06. +// Copyright 2006 __MyCompanyName__. All rights reserved. +// + +#import + + +@interface RoundBackgroundCell : NSTextFieldCell { + NSBezierPath *path; +} + +@end diff --git a/Custom/RoundBackgroundCell.m b/Custom/RoundBackgroundCell.m new file mode 100644 index 000000000..446d7cc43 --- /dev/null +++ b/Custom/RoundBackgroundCell.m @@ -0,0 +1,82 @@ +// +// BLRoundedTableCell.m +// +// Created by Fraser Speirs on Wed Mar 17 2004. +// +// This code is placed in the public domain. +// It is based on ideas presented by Apple Computer +// in sample code via ADC, extended to suit the context of +// NSTableViewCell + +#import "RoundBackgroundCell.h" + + +@implementation RoundBackgroundCell + +- (void)drawInteriorWithFrame:(NSRect)cellFrame inView:(NSView *)controlView { + NSRect labelRect = [self drawingRectForBounds:cellFrame]; + float capRadius = NSHeight(labelRect) / 2.0; + + // Next, we hack up a slightly different rect for the superclass + // to draw in. This shifts the text to the right out of the + // highlight curve and makes sure the text doesn't jump around + // when the selection changes + float widthIndent = 5.0; + float heightIndent = 2.0; + NSRect newRect = NSMakeRect(cellFrame.origin.x+widthIndent, + cellFrame.origin.y+heightIndent, + cellFrame.size.width-widthIndent, + cellFrame.size.height-heightIndent); + + if([self isHighlighted]) { + [super drawInteriorWithFrame: newRect inView: controlView]; + } + else { + [super drawInteriorWithFrame: newRect inView: controlView]; + NSBezierPath *highlightPath = [[NSBezierPath alloc] init]; + + NSPoint startPoint = NSMakePoint(labelRect.origin.x+capRadius, + labelRect.origin.y+capRadius); + + NSPoint endPoint = NSMakePoint((labelRect.origin.x-capRadius)+(labelRect.size.width), + labelRect.origin.y+capRadius); + + [highlightPath appendBezierPathWithArcWithCenter: startPoint + radius: capRadius + startAngle: 90.0f + endAngle: 270.f + clockwise: NO]; + + [highlightPath appendBezierPathWithArcWithCenter: endPoint + radius: capRadius + startAngle: 270.0f + endAngle: 90.f + clockwise: NO]; + + [highlightPath closePath]; + + // Might want to change the text color here + // NSColor *originalTextColor = [self textColor]; + if (highlightPath) { + [[self backgroundColor] set]; + [highlightPath fill]; + + NSColor *strokeColor = [NSColor colorWithCalibratedHue:[[self backgroundColor] hueComponent] saturation:[[self backgroundColor] saturationComponent] brightness:[[self backgroundColor] brightnessComponent]-0.2 alpha:[[self backgroundColor] alphaComponent]]; + + [strokeColor set]; + [highlightPath stroke]; + [highlightPath release]; + } + + [super drawInteriorWithFrame: newRect inView: controlView]; + + // And change it back here + /* + if (originalTextColor) { + [self setTextColor:originalTextColor]; + } + + */ + } +} +@end diff --git a/Custom/RoundBackgroundField.h b/Custom/RoundBackgroundField.h new file mode 100644 index 000000000..81b10714f --- /dev/null +++ b/Custom/RoundBackgroundField.h @@ -0,0 +1,16 @@ +// +// RoundBackgroundField.h +// Cog +// +// Created by Zaphod Beeblebrox on 4/28/06. +// Copyright 2006 __MyCompanyName__. All rights reserved. +// + +#import + + +@interface RoundBackgroundField : NSTextField { + +} + +@end diff --git a/Custom/RoundBackgroundField.m b/Custom/RoundBackgroundField.m new file mode 100644 index 000000000..08faa0df2 --- /dev/null +++ b/Custom/RoundBackgroundField.m @@ -0,0 +1,35 @@ +// +// RoundBackgroundField.m +// Cog +// +// Created by Zaphod Beeblebrox on 4/28/06. +// Copyright 2006 __MyCompanyName__. All rights reserved. +// + +#import "RoundBackgroundField.h" +#import "RoundBackgroundCell.h" + +@implementation RoundBackgroundField + +- (void)awakeFromNib +{ + id cell = [[RoundBackgroundCell alloc] init]; + id oldcell = [self cell]; + + [cell setBackgroundColor: [self backgroundColor]]; + [cell setDrawsBackground: NO]; + + [cell setScrollable:[oldcell isScrollable]]; + [cell setAlignment:[oldcell alignment]]; + [cell setLineBreakMode:[oldcell lineBreakMode]]; + + [cell setAction: [oldcell action]]; + [cell setTarget: [oldcell target]]; + + [cell setStringValue: [oldcell stringValue]]; + + [self setCell: cell]; + [cell release]; +} + +@end diff --git a/English.lproj/Localizable.strings b/English.lproj/Localizable.strings index 040e0165e..7f8d4af5f 100644 --- a/English.lproj/Localizable.strings +++ b/English.lproj/Localizable.strings @@ -13,8 +13,8 @@ "PrevButtonTooltip" = "Previous"; "NextButtonTooltip" = "Next"; -"TimeElapsed" = "Time Elapsed: %i:%02i"; -"TimeRemaining" = "Time Remaining: %i:%02i"; +"TimeElapsed" = "Time: %i:%02i"; +"TimeRemaining" = "Time: -%i:%02i"; "AddButtonTooltip" = "Add files"; "RemoveButtonTooltip" = "Remove selected files"; diff --git a/English.lproj/MainMenu.nib/classes.nib b/English.lproj/MainMenu.nib/classes.nib index c7c4f133d..b0861c055 100644 --- a/English.lproj/MainMenu.nib/classes.nib +++ b/English.lproj/MainMenu.nib/classes.nib @@ -28,12 +28,7 @@ }; SUPERCLASS = NSObject; }, - { - CLASS = ClickField; - LANGUAGE = ObjC; - OUTLETS = {soundController = SoundController; }; - SUPERCLASS = NSTextField; - }, + {CLASS = ClickField; LANGUAGE = ObjC; SUPERCLASS = RoundBackgroundField; }, { CLASS = DNDArrayController; LANGUAGE = ObjC; @@ -101,6 +96,7 @@ }; SUPERCLASS = NSTableView; }, + {CLASS = RoundBackgroundField; LANGUAGE = ObjC; SUPERCLASS = NSTextField; }, { ACTIONS = { changeVolume = id; diff --git a/English.lproj/MainMenu.nib/info.nib b/English.lproj/MainMenu.nib/info.nib index dedba872b..eaa24ea8d 100644 --- a/English.lproj/MainMenu.nib/info.nib +++ b/English.lproj/MainMenu.nib/info.nib @@ -3,15 +3,15 @@ IBDocumentLocation - 69 473 617 240 0 0 1024 746 + 42 324 617 240 0 0 1024 746 IBEditorPositions 29 - 235 637 346 44 0 0 1024 746 + 649 654 346 44 0 0 1024 746 463 - 336 385 352 268 0 0 1024 746 + 336 384 352 268 0 0 1024 746 513 - 143 464 125 137 0 0 1024 746 + 639 190 125 137 0 0 1024 746 IBFramework Version 443.0 @@ -29,9 +29,9 @@ IBOpenObjects 21 - 29 513 - 463 + 29 + 823 IBSystem Version 8I127 diff --git a/English.lproj/MainMenu.nib/keyedobjects.nib b/English.lproj/MainMenu.nib/keyedobjects.nib index bb01b2e3a..3b9a2c0b0 100644 Binary files a/English.lproj/MainMenu.nib/keyedobjects.nib and b/English.lproj/MainMenu.nib/keyedobjects.nib differ diff --git a/French.lproj/Localizable.strings b/French.lproj/Localizable.strings index 9a4f6f742..ef7dc2b24 100644 --- a/French.lproj/Localizable.strings +++ b/French.lproj/Localizable.strings @@ -13,8 +13,8 @@ "PrevButtonTooltip" = "Morceau précédent"; "NextButtonTooltip" = "Morceau suivant"; -"TimeElapsed" = "Temps écoulé: %i:%02i"; -"TimeRemaining" = "Temps restant: %i:%02i"; +"TimeElapsed" = "Temps: %i:%02i"; +"TimeRemaining" = "Temps: -%i:%02i"; "AddButtonTooltip" = "Ajouter des fichiers"; "RemoveButtonTooltip" = "Retirer les fichiers sélectionnés"; diff --git a/Icons/wheel.icns b/Icons/wheel.icns index 632306546..0d34df522 100644 Binary files a/Icons/wheel.icns and b/Icons/wheel.icns differ diff --git a/Playlist/PlaylistView.m b/Playlist/PlaylistView.m index 1bb6d5b27..685970363 100644 --- a/Playlist/PlaylistView.m +++ b/Playlist/PlaylistView.m @@ -12,6 +12,23 @@ @implementation PlaylistView +- (void)awakeFromNib +{ + id c; + NSControlSize s = NSSmallControlSize; + NSEnumerator *oe = [[self tableColumns] objectEnumerator]; + NSFont *f = [NSFont systemFontOfSize:[NSFont systemFontSizeForControlSize:s]]; + + [self setRowHeight:[f defaultLineHeightForFont]]; + + //Resize the fonts + while (c = [oe nextObject]) + { + [[c dataCell] setControlSize:s]; + [[c dataCell] setFont:f]; + } +} + - (BOOL)acceptsFirstResponder { return YES; diff --git a/Sound/SoundFile/WavPackFile.m b/Sound/SoundFile/WavPackFile.m index 042c858d8..e3dff1951 100644 --- a/Sound/SoundFile/WavPackFile.m +++ b/Sound/SoundFile/WavPackFile.m @@ -63,6 +63,8 @@ } n *= (bitsPerSample/8)*channels; + free(sampleBuf); + return n; }