* implemented the volume slider

* major speed and memory improvements to the image handling (the panel launches noticebly faster now) and controls 
* coding style fixes

- just FYI: The VLCFSVolumeSlider and VLCFSTimeSlider classes will be merged later on to add as little code duplication as possible.

extras/MacOSX/Resources/English.lproj/MainMenu.nib/info.nib

@@ -26,10 +26,10 @@
 	<key>IBOpenObjects</key>
 	<array>
 		<integer>21</integer>
-		<integer>2197</integer>
 		<integer>2730</integer>
-		<integer>2769</integer>
 		<integer>29</integer>
+		<integer>2416</integer>
+		<integer>2769</integer>
 	</array>
 	<key>IBSystem Version</key>
 	<string>8L127</string>

modules/gui/macosx/fspanel.h

@@ -44,6 +44,7 @@
 - (void)setStreamTitle:(NSString *)o_title;
 - (void)setStreamPos:(float) f_pos andTime:(NSString *)o_time;
 - (void)setSeekable:(BOOL) b_seekable;
+- (void)setVolumeLevel: (float)f_volumeLevel;
 
 - (void)focus:(NSTimer *)timer;
 - (void)unfocus:(NSTimer *)timer;
@@ -67,8 +68,8 @@
 {
     NSColor *fillColor;
     NSButton *o_prev, *o_next, *o_slow, *o_fast, *o_play, *o_fullscreen;
-    NSTextField *o_textfield, *o_textPos;
-    NSSlider *o_fs_timeSlider;
+    NSTextField *o_streamTitle_txt, *o_streamPosition_txt;
+    NSSlider *o_fs_timeSlider, *o_fs_volumeSlider;
 }
 - (id)initWithFrame:(NSRect)frameRect;
 - (void)drawRect:(NSRect)rect;
@@ -76,21 +77,31 @@
 - (void)setPlay;
 - (void)setPause;
 - (void)setStreamTitle: (NSString *)o_title;
-- (void)setStreamPos:(float) f_pos andTime:(NSString *)o_time;
+- (void)setStreamPos: (float)f_pos andTime: (NSString *)o_time;
 - (void)setSeekable: (BOOL)b_seekable; 
+- (void)setVolumeLevel: (float)f_volumeLevel;
 - (IBAction)play:(id)sender;
 - (IBAction)prev:(id)sender;
 - (IBAction)next:(id)sender;
 - (IBAction)faster:(id)sender;
 - (IBAction)slower:(id)sender;
 - (IBAction)fsTimeSliderUpdate:(id)sender;
+- (IBAction)fsVolumeSliderUpdate:(id)sender;
 
 @end
 
 @interface VLCFSTimeSlider : NSSlider
-{}
-void drawKnobInRect(NSRect knobRect);
-void drawFrameInRect(NSRect frameRect);
+{
+}
+- (void)drawKnobInRect:(NSRect)knobRect;
+- (void)drawRect:(NSRect)rect;
+
+@end
+
+@interface VLCFSVolumeSlider : NSSlider
+{
+}
+- (void)drawKnobInRect:(NSRect)knobRect;
 - (void)drawRect:(NSRect)rect;
 
 @end

modules/gui/macosx/fspanel.m

@@ -102,11 +102,16 @@
     [[self contentView] setStreamPos:f_pos andTime: o_time];
 }
 
-- (void)setSeekable:(BOOL) b_seekable;
+- (void)setSeekable:(BOOL) b_seekable
 {
     [[self contentView] setSeekable: b_seekable];
 }
 
+- (void)setVolumeLevel: (float)f_volumeLevel
+{
+    [[self contentView] setVolumeLevel: f_volumeLevel];
+}
+
 /* This routine is called repeatedly when the mouse enters the window from outside it. */
 - (void)focus:(NSTimer *)timer
 {
@@ -276,10 +281,8 @@
     [o_button setBezelStyle: NSRegularSquareBezelStyle];                                        \
     [o_button setBordered: NO];                                                                 \
     [o_button setFont:[NSFont systemFontOfSize:0]];                                             \
-    image = [[NSImage alloc] initWithContentsOfFile:[bundle pathForImageResource:imageOff]];    \
-    [o_button setImage:image];                                                                  \
-    image = [[NSImage alloc] initWithContentsOfFile:[bundle pathForImageResource:imageOn]];     \
-    [o_button setAlternateImage:image];                                                         \
+    [o_button setImage:[NSImage imageNamed:imageOff]];                                 \
+    [o_button setAlternateImage:[NSImage imageNamed:imageOn]];                         \
     [o_button sizeToFit];                                                                       \
     [o_button setTarget: self];                                                                 \
     [o_button setAction: @selector(action:)];                                                   \
@@ -299,21 +302,21 @@
 
 - (id)initWithFrame:(NSRect)frameRect
 {
-    NSBundle * bundle = [NSBundle mainBundle];
     id view = [super initWithFrame:frameRect];
     fillColor = [[NSColor clearColor] retain];
     NSRect s_rc = [self frame];
     NSImage * image;
-    addButton( o_prev, @"fs_skip_previous.png" , @"fs_skip_previous_highlight.png", 174, 15, prev );
-    addButton( o_slow, @"fs_rewind.png"        , @"fs_rewind_highlight.png"       , 211, 14, slower );
-    addButton( o_play, @"fs_play.png"          , @"fs_play_highlight.png"         , 269, 10, play );
-    addButton( o_fast, @"fs_forward.png"       , @"fs_forward_highlight.png"      , 313, 14, faster );
-    addButton( o_next, @"fs_skip_next.png"     , @"fs_skip_next_highlight.png"    , 365, 15, next );
-    addButton( o_fullscreen, @"fs_exit_fullscreen.png", @"fs_exit_fullscreen_hightlight.png", 507, 13, windowAction );
+    addButton( o_prev, @"fs_skip_previous" , @"fs_skip_previous_highlight", 174, 15, prev );
+    addButton( o_slow, @"fs_rewind"        , @"fs_rewind_highlight"       , 211, 14, slower );
+    addButton( o_play, @"fs_play"          , @"fs_play_highlight"         , 267, 10, play );
+    addButton( o_fast, @"fs_forward"       , @"fs_forward_highlight"      , 313, 14, faster );
+    addButton( o_next, @"fs_skip_next"     , @"fs_skip_next_highlight"    , 365, 15, next );
+    addButton( o_fullscreen, @"fs_exit_fullscreen", @"fs_exit_fullscreen_hightlight", 507, 13, windowAction );
 /*
-    addButton( o_button, @"FSVolumeThumbOff.tif"   , @"FSVolumeThumbOn.tif"  ,  38, 51, something );
+    addButton( o_button, @"image (off state)", @"image (on state)", 38, 51, something );
  */
 
+    /* time slider */
     s_rc = [self frame];
     s_rc.origin.x = 15;
     s_rc.origin.y = 53;
@@ -328,16 +331,32 @@
     [o_fs_timeSlider setAction: @selector(fsTimeSliderUpdate:)];
     [self addSubview: o_fs_timeSlider];
 
+    /* volume slider */
+    s_rc = [self frame];
+    s_rc.origin.x = 26;
+    s_rc.origin.y = 17.5;
+    s_rc.size.width = 95;
+    s_rc.size.height = 10;
+    o_fs_volumeSlider = [[VLCFSVolumeSlider alloc] initWithFrame: s_rc];
+    [o_fs_volumeSlider setMinValue:0];
+    [o_fs_volumeSlider setMaxValue:32];
+    [o_fs_volumeSlider setFloatValue: 0];
+    [o_fs_volumeSlider setContinuous: YES];
+    [o_fs_volumeSlider setTarget: self];
+    [o_fs_volumeSlider setAction: @selector(fsVolumeSliderUpdate:)];
+    [self addSubview: o_fs_volumeSlider];
+    
+    /* time counter and stream title output fields */
     s_rc = [self frame];
     s_rc.origin.x = 98;
     s_rc.origin.y = 64;
     s_rc.size.width = 352;
     s_rc.size.height = 14;
-    addTextfield( o_textfield, NSCenterTextAlignment, systemFontOfSize, whiteColor, 0 );
+    addTextfield( o_streamTitle_txt, NSCenterTextAlignment, systemFontOfSize, whiteColor, 0 );
     s_rc.origin.x = 486;
     s_rc.origin.y = 64;
     s_rc.size.width = 50;
-    addTextfield( o_textPos, NSRightTextAlignment, systemFontOfSize, whiteColor, 0 );
+    addTextfield( o_streamPosition_txt, NSRightTextAlignment, systemFontOfSize, whiteColor, 0 );
 
     return view;
 }
@@ -345,6 +364,15 @@
 - (void)dealloc
 {
     [o_fs_timeSlider release];
+    [o_fs_volumeSlider release];
+    [o_prev release];
+    [o_next release];
+    [o_slow release];
+    [o_play release];
+    [o_fast release];
+    [o_fullscreen release];
+    [o_streamTitle_txt release];
+    [o_streamPosition_txt release];
     [super dealloc];
 }
 
@@ -352,11 +380,9 @@
 {
     NSBundle *bundle = [NSBundle mainBundle];
     NSImage *image;
-    [[o_play image] release];
-    [[o_play alternateImage] release];
-    image = [[NSImage alloc] initWithContentsOfFile:[bundle pathForImageResource:@"fs_play.png"]];
+    image = [NSImage imageNamed:@"fs_play"];
     [o_play setImage:image];
-    image = [[NSImage alloc] initWithContentsOfFile:[bundle pathForImageResource:@"fs_play_highlight.png"]];
+    image = [NSImage imageNamed:@"fs_play_highlight"];
     [o_play setAlternateImage:image];
 }
 
@@ -364,22 +390,20 @@
 {
     NSBundle *bundle = [NSBundle mainBundle];
     NSImage *image;
-    [[o_play image] release];
-    [[o_play alternateImage] release];
-    image = [[NSImage alloc] initWithContentsOfFile:[bundle pathForImageResource:@"fs_pause.png"]];
+    image = [NSImage imageNamed:@"fs_pause"];
     [o_play setImage:image];
-    image = [[NSImage alloc] initWithContentsOfFile:[bundle pathForImageResource:@"fs_pause_highlight.png"]];
+    image = [NSImage imageNamed:@"fs_pause_highlight"];
     [o_play setAlternateImage:image];
 }
 
 - (void)setStreamTitle:(NSString *)o_title
 {
-    [o_textfield setStringValue: o_title];
+    [o_streamTitle_txt setStringValue: o_title];
 }
 
 - (void)setStreamPos:(float) f_pos andTime:(NSString *)o_time
 {
-    [o_textPos setStringValue: o_time];
+    [o_streamPosition_txt setStringValue: o_time];
     [o_fs_timeSlider setFloatValue: f_pos];
 }
 
@@ -390,6 +414,11 @@
     [o_fs_timeSlider setEnabled: b_seekable];
 }
 
+- (void)setVolumeLevel: (float)f_volumeLevel
+{
+    [o_fs_volumeSlider setFloatValue: f_volumeLevel];
+}
+
 - (IBAction)play:(id)sender
 {
     [[[VLCMain sharedInstance] getControls] play: sender];
@@ -425,8 +454,13 @@
     [[VLCMain sharedInstance] timesliderUpdate: sender];
 }
 
+- (IBAction)fsVolumeSliderUpdate:(id)sender
+{
+    [[[VLCMain sharedInstance] getControls] volumeSliderUpdated: sender];
+}
+
 #define addImage(image, _x, _y, mode, _width)                                               \
-    img = [[[NSImage alloc] initWithContentsOfFile:[bundle pathForImageResource:image]] autorelease];     \
+    img = [NSImage imageNamed:image];                                              \
     image_rect.size = [img size];                                                           \
     image_rect.origin.x = 0;                                                                \
     image_rect.origin.y = 0;                                                                \
@@ -438,15 +472,14 @@
 
 - (void)drawRect:(NSRect)rect
 {
-    NSBundle *bundle = [NSBundle mainBundle];
 	NSRect frame = [self frame];
     NSRect image_rect;
     NSImage *img;
-    addImage( @"fs_background.png", 0, 0, NSCompositeCopy, 0 );
-    addImage( @"fs_volume_slider_bar.png" , 26, 22, NSCompositeSourceOver, 0 );
-    addImage( @"fs_volume_mute.png", 16, 18, NSCompositeSourceOver, 0 );
-    addImage( @"fs_volume_max.png", 124, 17, NSCompositeSourceOver, 0 );
-    addImage(@"fs_time_slider.png" ,  15, 53, NSCompositeSourceOver, 0);
+    addImage( @"fs_background", 0, 0, NSCompositeCopy, 0 );
+    addImage( @"fs_volume_slider_bar", 26, 22, NSCompositeSourceOver, 0 );
+    addImage( @"fs_volume_mute", 16, 18, NSCompositeSourceOver, 0 );
+    addImage( @"fs_volume_max", 124, 17, NSCompositeSourceOver, 0 );
+    addImage( @"fs_time_slider", 15, 53, NSCompositeSourceOver, 0);
 }
 
 @end
@@ -455,11 +488,11 @@
  * VLCFSTimeSlider
  *****************************************************************************/
 @implementation VLCFSTimeSlider
-void drawKnobInRect(NSRect knobRect)
+- (void)drawKnobInRect:(NSRect)knobRect
 {
     NSBundle *bundle = [NSBundle mainBundle];
     NSRect image_rect;
-    NSImage *img = [[NSImage alloc] initWithContentsOfFile:[bundle pathForImageResource:@"fs_time_slider_knob.png"]];
+    NSImage *img = [NSImage imageNamed:@"fs_time_slider_knob_highlight"];
     image_rect.size = [img size];
     image_rect.origin.x = 0;
     image_rect.origin.y = 0;
@@ -469,9 +502,38 @@ void drawKnobInRect(NSRect knobRect)
     [img drawInRect:knobRect fromRect:image_rect operation:NSCompositeSourceOver fraction:1];
 }
 
-void drawFrameInRect(NSRect frameRect) 
+- (void)drawRect:(NSRect)rect
 {
-    /* we don't do anything here atm */
+    /* Draw default to make sure the slider behaves correctly */
+    [[NSGraphicsContext currentContext] saveGraphicsState];
+    NSRectClip(NSZeroRect);
+    [super drawRect:rect];
+    [[NSGraphicsContext currentContext] restoreGraphicsState];
+    
+    NSRect knobRect = [[self cell] knobRectFlipped:NO];
+    knobRect.origin.y+=7.5;
+    [[[NSColor blackColor] colorWithAlphaComponent:0.6] set];
+    [self drawKnobInRect: knobRect];
+}
+
+@end
+
+/*****************************************************************************
+* VLCFSVolumeSlider
+*****************************************************************************/
+@implementation VLCFSVolumeSlider
+- (void)drawKnobInRect:(NSRect) knobRect
+{
+    NSBundle *bundle = [NSBundle mainBundle];
+    NSRect image_rect;
+    NSImage *img = [NSImage imageNamed:@"fs_volume_slider_knob"];
+    image_rect.size = [img size];
+    image_rect.origin.x = 0;
+    image_rect.origin.y = 0;
+    knobRect.origin.x += (knobRect.size.width - image_rect.size.width) / 2;
+    knobRect.size.width = image_rect.size.width;
+    knobRect.size.height = image_rect.size.height;
+    [img drawInRect:knobRect fromRect:image_rect operation:NSCompositeSourceOver fraction:1];
 }
 
 - (void)drawRect:(NSRect)rect
@@ -483,10 +545,9 @@ void drawFrameInRect(NSRect frameRect)
     [[NSGraphicsContext currentContext] restoreGraphicsState];
     
     NSRect knobRect = [[self cell] knobRectFlipped:NO];
-    knobRect.origin.y+=7.5;
+    knobRect.origin.y+=6;
     [[[NSColor blackColor] colorWithAlphaComponent:0.6] set];
-    drawFrameInRect(rect);
-    drawKnobInRect(knobRect);
+    [self drawKnobInRect: knobRect];
 }
 
 @end
\ No newline at end of file

modules/gui/macosx/intf.m

@@ -1212,6 +1212,7 @@ static VLCMain *_o_sharedMainInstance = nil;
             i_volume_step = config_GetInt( p_intf->p_libvlc, "volume-step" );
             [o_volumeslider setFloatValue: (float)i_lastShownVolume / i_volume_step];
             [o_volumeslider setEnabled: TRUE];
+            [[[self getControls] getFSPanel] setVolumeLevel: (float)i_lastShownVolume / i_volume_step];
             p_intf->p_sys->b_mute = ( i_lastShownVolume == 0 );
             p_intf->p_sys->b_volume_update = FALSE;
         }