macosx: compilation fix

[vlc] / modules / gui / macosx / ControlsBar.m

diff --git a/modules/gui/macosx/ControlsBar.m b/modules/gui/macosx/ControlsBar.m
index 461f8a5eff8cc4266a2cb55861318358ef69b103..8fec32af017e356d2886954b888b7f298659dca0 100644 (file)
--- a/modules/gui/macosx/ControlsBar.m
+++ b/modules/gui/macosx/ControlsBar.m
@@ -158,6 +158,11 @@
 
 }
 
+- (CGFloat)height
+{
+    return [o_bottombar_view frame].size.height;
+}
+
 #pragma mark -
 #pragma mark Button Actions
 
@@ -291,22 +296,26 @@
 
         mtime_t dur = input_item_GetDuration(input_GetItem(p_input));
         if (dur == -1) {
-            [o_time_sld setEnabled: NO];
             [o_time_sld setHidden: YES];
             [o_time_sld_fancygradient_view setHidden: YES];
         } else {
-            [o_time_sld setEnabled: YES];
-            [o_time_sld setHidden: NO];
-            [o_time_sld_fancygradient_view setHidden: NO];
+            if ([o_time_sld isHidden] == YES) {
+                bool b_buffering = false;
+                input_state_e inputState = input_GetState(p_input);
+                if (inputState == INIT_S || inputState == OPENING_S)
+                    b_buffering = YES;
+
+                [o_time_sld setHidden: b_buffering];
+                [o_time_sld_fancygradient_view setHidden: b_buffering];
+            }
         }
-
         [o_time_fld setStringValue: o_time];
         [o_time_fld setNeedsDisplay:YES];
+
         vlc_object_release(p_input);
     } else {
         [o_time_sld setFloatValue: 0.0];
         [o_time_fld setStringValue: @"00:00"];
-        [o_time_sld setEnabled: NO];
         [o_time_sld setHidden: YES];
         [o_time_sld_fancygradient_view setHidden: YES];
     }
@@ -340,6 +349,7 @@
     bool b_plmul = false;
     bool b_seekable = false;
     bool b_chapters = false;
+    bool b_buffering = false;
 
     playlist_t * p_playlist = pl_Get(VLCIntf);
 
@@ -351,6 +361,10 @@
 
 
     if (p_input) {
+        input_state_e inputState = input_GetState(p_input);
+        if (inputState == INIT_S || inputState == OPENING_S)
+            b_buffering = YES;
+
         /* seekable streams */
         b_seekable = var_GetBool(p_input, "can-seek");
 
@@ -360,6 +374,18 @@
         vlc_object_release(p_input);
     }
 
+
+    if (b_buffering) {
+        [o_progress_bar startAnimation:self];
+        [o_progress_bar setIndeterminate:YES];
+        [o_progress_bar setHidden:NO];
+    } else {
+        [o_progress_bar stopAnimation:self];
+        [o_progress_bar setHidden:YES];
+    }
+
+    [o_time_sld setEnabled: b_seekable];
+
     [o_fwd_btn setEnabled: (b_seekable || b_plmul || b_chapters)];
     [o_bwd_btn setEnabled: (b_seekable || b_plmul || b_chapters)];
 }
@@ -457,6 +483,7 @@
         [o_volume_down_btn setImage: [NSImage imageNamed:@"volume-low"]];
         [o_volume_track_view setImage: [NSImage imageNamed:@"volume-slider-track"]];
         [o_volume_up_btn setImage: [NSImage imageNamed:@"volume-high"]];
+        [o_volume_sld setUsesBrightArtwork: YES];
 
         if (b_nativeFullscreenMode) {
             [o_effects_btn setImage: [NSImage imageNamed:@"effects-one-button"]];
@@ -488,6 +515,7 @@
         [o_volume_down_btn setImage: [NSImage imageNamed:@"volume-low_dark"]];
         [o_volume_track_view setImage: [NSImage imageNamed:@"volume-slider-track_dark"]];
         [o_volume_up_btn setImage: [NSImage imageNamed:@"volume-high_dark"]];
+        [o_volume_sld setUsesBrightArtwork: NO];
 
         if (b_nativeFullscreenMode) {
             [o_effects_btn setImage: [NSImage imageNamed:@"effects-one-button_dark"]];
@@ -507,9 +535,9 @@
 
     BOOL b_mute = ![[VLCCoreInteraction sharedInstance] mute];
     [o_volume_sld setEnabled: b_mute];
+    [o_volume_sld setMaxValue: [[VLCCoreInteraction sharedInstance] maxVolume]];
     [o_volume_up_btn setEnabled: b_mute];
 
-
     // remove fullscreen button for lion fullscreen
     if (b_nativeFullscreenMode) {
         NSRect frame;
@@ -1058,9 +1086,9 @@ else \
     [super updateControls];
 
     bool b_input = false;
+    bool b_seekable = false;
     bool b_plmul = false;
     bool b_control = false;
-    bool b_seekable = false;
     bool b_chapters = false;
 
     playlist_t * p_playlist = pl_Get(VLCIntf);
@@ -1070,15 +1098,7 @@ else \
     PL_UNLOCK;
 
     input_thread_t * p_input = playlist_CurrentInput(p_playlist);
-
-    bool b_buffering = NO;
-
     if ((b_input = (p_input != NULL))) {
-        /* seekable streams */
-        input_state_e inputState = input_GetState(p_input);
-        if (inputState == INIT_S || inputState == OPENING_S)
-            b_buffering = YES;
-
         /* seekable streams */
         b_seekable = var_GetBool(p_input, "can-seek");
 
@@ -1091,15 +1111,6 @@ else \
         vlc_object_release(p_input);
     }
 
-    if (b_buffering) {
-        [o_progress_bar startAnimation:self];
-        [o_progress_bar setIndeterminate:YES];
-        [o_progress_bar setHidden:NO];
-    } else {
-        [o_progress_bar stopAnimation:self];
-        [o_progress_bar setHidden:YES];
-    }
-
     [o_stop_btn setEnabled: b_input];
 
     if (b_show_jump_buttons) {
@@ -1107,7 +1118,6 @@ else \
         [o_next_btn setEnabled: (b_seekable || b_plmul || b_chapters)];
     }
 
-    [o_time_sld setEnabled: b_seekable];
     [[VLCMainMenu sharedInstance] setRateControlsEnabled: b_control];
 }