Commit 268f255b authored by bigben's avatar bigben
Browse files

* Only enable "Jump To Time" when the stream is seekable

* Fix enabling of the step forward/backward functions
parent f193ee64
...@@ -11,17 +11,18 @@ ...@@ -11,17 +11,18 @@
<key>2197</key> <key>2197</key>
<string>422 532 596 143 0 0 1440 878 </string> <string>422 532 596 143 0 0 1440 878 </string>
<key>29</key> <key>29</key>
<string>356 400 438 44 0 0 1440 878 </string> <string>71 662 438 44 0 0 1024 746 </string>
<key>915</key> <key>915</key>
<string>777 479 187 249 0 0 1440 878 </string> <string>777 479 187 249 0 0 1440 878 </string>
</dict> </dict>
<key>IBFramework Version</key> <key>IBFramework Version</key>
<string>443.0</string> <string>439.0</string>
<key>IBLockedObjects</key> <key>IBLockedObjects</key>
<array/> <array/>
<key>IBOpenObjects</key> <key>IBOpenObjects</key>
<array> <array>
<integer>1789</integer> <integer>1789</integer>
<integer>29</integer>
</array> </array>
<key>IBSystem Version</key> <key>IBSystem Version</key>
<string>8H14</string> <string>8H14</string>
......
...@@ -605,7 +605,7 @@ ...@@ -605,7 +605,7 @@
@end @end
@implementation VLCControls (NSMenuValidation) @implementation VLCControls (NSMenuValidation)
- (BOOL)validateMenuItem:(NSMenuItem *)o_mi - (BOOL)validateMenuItem:(NSMenuItem *)o_mi
{ {
BOOL bEnabled = TRUE; BOOL bEnabled = TRUE;
...@@ -640,7 +640,7 @@ ...@@ -640,7 +640,7 @@
{ {
bEnabled = FALSE; bEnabled = FALSE;
} }
[o_main setupMenus]; /* Make sure input menu is up to date */ [o_main setupMenus]; /* Make sure input menu is up to date */
} }
else if( [[o_mi title] isEqualToString: _NS("Previous")] || else if( [[o_mi title] isEqualToString: _NS("Previous")] ||
[[o_mi title] isEqualToString: _NS("Next")] ) [[o_mi title] isEqualToString: _NS("Next")] )
...@@ -669,18 +669,20 @@ ...@@ -669,18 +669,20 @@
[o_mi setState: i_state]; [o_mi setState: i_state];
} }
else if( [[o_mi title] isEqualToString: _NS("Step Forward")] || else if( [[o_mi title] isEqualToString: _NS("Step Forward")] ||
[[o_mi title] isEqualToString: _NS("Step Backward")] ) [[o_mi title] isEqualToString: _NS("Step Backward")] ||
[[o_mi title] isEqualToString: _NS("Jump To Time")])
{ {
if( p_input != NULL ) if( p_input != NULL )
{ {
var_Get( p_input, "seekable", &val); var_Get( p_input, "seekable", &val);
bEnabled = val.b_bool; bEnabled = val.b_bool;
} }
else bEnabled = FALSE;
} }
else if( [[o_mi title] isEqualToString: _NS("Mute")] ) else if( [[o_mi title] isEqualToString: _NS("Mute")] )
{ {
[o_mi setState: p_intf->p_sys->b_mute ? NSOnState : NSOffState]; [o_mi setState: p_intf->p_sys->b_mute ? NSOnState : NSOffState];
[o_main setupMenus]; /* Make sure audio menu is up to date */ [o_main setupMenus]; /* Make sure audio menu is up to date */
} }
else if( [[o_mi title] isEqualToString: _NS("Half Size")] || else if( [[o_mi title] isEqualToString: _NS("Half Size")] ||
[[o_mi title] isEqualToString: _NS("Normal Size")] || [[o_mi title] isEqualToString: _NS("Normal Size")] ||
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment