[vlc-commits] macosx/MainMenu: cosmetics
Felix Paul Kühne
git at videolan.org
Fri Aug 24 12:32:25 CEST 2012
vlc | branch: master | Felix Paul Kühne <fkuehne at videolan.org> | Fri Aug 24 11:41:11 2012 +0200| [9ca2cc8e4f9bd54f52129bfe58bc0a1e8c3f7f6b] | committer: Felix Paul Kühne
macosx/MainMenu: cosmetics
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=9ca2cc8e4f9bd54f52129bfe58bc0a1e8c3f7f6b
---
modules/gui/macosx/MainMenu.h | 9 ++++---
modules/gui/macosx/MainMenu.m | 56 +++++++++++++++++++++--------------------
2 files changed, 34 insertions(+), 31 deletions(-)
diff --git a/modules/gui/macosx/MainMenu.h b/modules/gui/macosx/MainMenu.h
index 3889c98..eb295af 100644
--- a/modules/gui/macosx/MainMenu.h
+++ b/modules/gui/macosx/MainMenu.h
@@ -221,16 +221,17 @@
- (IBAction)intfOpenNet:(id)sender;
- (IBAction)intfOpenCapture:(id)sender;
-- (IBAction)toggleRecord:(id)sender;
-- (void)updateRecordState:(BOOL)b_value;
-- (IBAction)setPlaybackRate:(id)sender;
-- (void)updatePlaybackRate;
- (IBAction)toggleJumpButtons:(id)sender;
- (IBAction)togglePlaymodeButtons:(id)sender;
- (IBAction)togglePlaylistColumnTable:(id)sender;
- (void)setPlaylistColumnTableState:(NSInteger)i_state forColumn:(NSString *)o_column;
- (NSMenu *)setupPlaylistTableColumnsMenu;
+- (IBAction)toggleRecord:(id)sender;
+- (void)updateRecordState:(BOOL)b_value;
+- (IBAction)setPlaybackRate:(id)sender;
+- (void)updatePlaybackRate;
+
- (IBAction)toggleFullscreen:(id)sender;
- (IBAction)resizeVideoWindow:(id)sender;
- (IBAction)floatOnTop:(id)sender;
diff --git a/modules/gui/macosx/MainMenu.m b/modules/gui/macosx/MainMenu.m
index 1f3db13..aa31ca9 100644
--- a/modules/gui/macosx/MainMenu.m
+++ b/modules/gui/macosx/MainMenu.m
@@ -627,33 +627,7 @@ static VLCMainMenu *_o_sharedInstance = nil;
}
#pragma mark -
-#pragma mark Playback
-- (IBAction)toggleRecord:(id)sender
-{
- [[VLCCoreInteraction sharedInstance] toggleRecord];
-}
-
-- (void)updateRecordState:(BOOL)b_value
-{
- [o_mi_record setState:b_value];
-}
-
-- (IBAction)setPlaybackRate:(id)sender
-{
- [[VLCCoreInteraction sharedInstance] setPlaybackRate: [o_mi_rate_sld intValue]];
- int i = [[VLCCoreInteraction sharedInstance] playbackRate];
- double speed = pow( 2, (double)i / 17 );
- [o_mi_rate_fld setStringValue: [NSString stringWithFormat:@"%.2fx", speed]];
-}
-
-- (void)updatePlaybackRate
-{
- int i = [[VLCCoreInteraction sharedInstance] playbackRate];
- double speed = pow( 2, (double)i / 17 );
- [o_mi_rate_fld setStringValue: [NSString stringWithFormat:@"%.2fx", speed]];
- [o_mi_rate_sld setIntValue: i];
-}
-
+#pragma mark View
- (IBAction)toggleJumpButtons:(id)sender
{
BOOL b_value = !config_GetInt( VLCIntf, "macosx-show-playback-buttons" );
@@ -690,6 +664,34 @@ static VLCMainMenu *_o_sharedInstance = nil;
}
#pragma mark -
+#pragma mark Playback
+- (IBAction)toggleRecord:(id)sender
+{
+ [[VLCCoreInteraction sharedInstance] toggleRecord];
+}
+
+- (void)updateRecordState:(BOOL)b_value
+{
+ [o_mi_record setState:b_value];
+}
+
+- (IBAction)setPlaybackRate:(id)sender
+{
+ [[VLCCoreInteraction sharedInstance] setPlaybackRate: [o_mi_rate_sld intValue]];
+ int i = [[VLCCoreInteraction sharedInstance] playbackRate];
+ double speed = pow( 2, (double)i / 17 );
+ [o_mi_rate_fld setStringValue: [NSString stringWithFormat:@"%.2fx", speed]];
+}
+
+- (void)updatePlaybackRate
+{
+ int i = [[VLCCoreInteraction sharedInstance] playbackRate];
+ double speed = pow( 2, (double)i / 17 );
+ [o_mi_rate_fld setStringValue: [NSString stringWithFormat:@"%.2fx", speed]];
+ [o_mi_rate_sld setIntValue: i];
+}
+
+#pragma mark -
#pragma mark video menu
- (IBAction)toggleFullscreen:(id)sender
{
More information about the vlc-commits
mailing list