vlc/vlc-2.2 | branch: master | Felix Paul Kühne <[email protected]> | Sun Jul 13 17:33:44 2014 +0200| [324a6b5a0a1a92033de86ff8930a960176706f62] | committer: David Fuhrmann
macosx: fix typo preventing post-processing (refs #11613) (cherry picked from commit e972fb43c372c90e0f2963fe702b77455ddc7639) Signed-off-by: David Fuhrmann <[email protected]> Conflicts: modules/gui/macosx/MainMenu.m > http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=324a6b5a0a1a92033de86ff8930a960176706f62 --- modules/gui/macosx/MainMenu.m | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/modules/gui/macosx/MainMenu.m b/modules/gui/macosx/MainMenu.m index 53bd04e..dd993fb 100644 --- a/modules/gui/macosx/MainMenu.m +++ b/modules/gui/macosx/MainMenu.m @@ -22,11 +22,12 @@ *****************************************************************************/ #import "MainMenu.h" +#import "intf.h" + #import <vlc_common.h> #import <vlc_playlist.h> #import <vlc_input.h> -#import "intf.h" #import "open.h" #import "wizard.h" #import "about.h" @@ -289,7 +290,7 @@ static VLCMainMenu *_o_sharedInstance = nil; } char *psz_config = config_GetPsz(p_intf, "video-filter"); if (psz_config) { - if (!strstr(psz_config, "postprocess")) + if (!strstr(psz_config, "postproc")) [[o_mu_ffmpeg_pp itemAtIndex:0] setState:NSOnState]; else [[o_mu_ffmpeg_pp itemWithTag:config_GetInt(p_intf, "postproc-q")] setState:NSOnState]; @@ -961,17 +962,17 @@ static VLCMainMenu *_o_sharedInstance = nil; - (void)_disablePostProcessing { - [[VLCCoreInteraction sharedInstance] setVideoFilter:"postprocess" on:false]; + [[VLCCoreInteraction sharedInstance] setVideoFilter:"postproc" on:false]; } - (void)_enablePostProcessing { - [[VLCCoreInteraction sharedInstance] setVideoFilter:"postprocess" on:true]; + [[VLCCoreInteraction sharedInstance] setVideoFilter:"postproc" on:true]; } - (IBAction)togglePostProcessing:(id)sender { - char *psz_name = "postprocess"; + char *psz_name = "postproc"; NSInteger count = [o_mu_ffmpeg_pp numberOfItems]; for (NSUInteger x = 0; x < count; x++) [[o_mu_ffmpeg_pp itemAtIndex:x] setState:NSOffState]; @@ -983,7 +984,7 @@ static VLCMainMenu *_o_sharedInstance = nil; [self _enablePostProcessing]; [sender setState:NSOnState]; - [[VLCCoreInteraction sharedInstance] setVideoFilterProperty:"postproc-q" forFilter:"postprocess" integer:[sender tag]]; + [[VLCCoreInteraction sharedInstance] setVideoFilterProperty:"postproc-q" forFilter:"postproc" integer:[sender tag]]; } } _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
