* Adds postprocessing menu

diff --git a/extras/MacOSX/Resources/English.lproj/MainMenu.nib/classes.nib b/extras/MacOSX/Resources/English.lproj/MainMenu.nib/classes.nib
index 150fab420810314f92e3edbcc0598bb85d56f028..fea1a6b03512f0197dd2584aa5f5f785c699c90c 100644 (file)
--- a/extras/MacOSX/Resources/English.lproj/MainMenu.nib/classes.nib
+++ b/extras/MacOSX/Resources/English.lproj/MainMenu.nib/classes.nib
@@ -171,6 +171,7 @@
                 "o_mi_double_window" = id; 
                 "o_mi_equalizer" = id; 
                 "o_mi_faster" = id; 
+                "o_mi_ffmpeg_pp" = id; 
                 "o_mi_fittoscreen" = id; 
                 "o_mi_floatontop" = id; 
                 "o_mi_fullscreen" = id; 
@@ -227,6 +228,7 @@
                 "o_mu_deinterlace" = id; 
                 "o_mu_device" = id; 
                 "o_mu_edit" = id; 
+                "o_mu_ffmpeg_pp" = id; 
                 "o_mu_file" = id; 
                 "o_mu_help" = id; 
                 "o_mu_program" = id; 

diff --git a/extras/MacOSX/Resources/English.lproj/MainMenu.nib/info.nib b/extras/MacOSX/Resources/English.lproj/MainMenu.nib/info.nib
index 82dc353ad15d642962729ec5d4d682b97825e4c4..5bbcdf47f4bc00d3ca151bbd4504712571f33b8c 100644 (file)
--- a/extras/MacOSX/Resources/English.lproj/MainMenu.nib/info.nib
+++ b/extras/MacOSX/Resources/English.lproj/MainMenu.nib/info.nib
@@ -9,7 +9,7 @@
                <key>1617</key>
                <string>542 480 104 149 0 0 1024 746 </string>
                <key>29</key>
-               <string>521 894 419 44 0 0 1280 1002 </string>
+               <string>41 667 419 44 0 0 1024 746 </string>
                <key>915</key>
                <string>54 452 185 199 0 0 1024 746 </string>
        </dict>
@@ -22,7 +22,6 @@
        <key>IBOpenObjects</key>
        <array>
                <integer>29</integer>
-               <integer>2029</integer>
                <integer>21</integer>
        </array>
        <key>IBSystem Version</key>

diff --git a/extras/MacOSX/Resources/English.lproj/MainMenu.nib/objects.nib b/extras/MacOSX/Resources/English.lproj/MainMenu.nib/objects.nib
index 2a86222fd283607a7f51a53afe97c0f689298949..521ca29e57b4cd97138362d07c010f584744bec6 100644 (file)
Binary files a/extras/MacOSX/Resources/English.lproj/MainMenu.nib/objects.nib and b/extras/MacOSX/Resources/English.lproj/MainMenu.nib/objects.nib differ

diff --git a/modules/gui/macosx/intf.h b/modules/gui/macosx/intf.h
index f3fbef575b13e6f982b65ae2cff315d462b71405..71d76474429f7676e5adfc87d4b1a0292789781e 100644 (file)
--- a/modules/gui/macosx/intf.h
+++ b/modules/gui/macosx/intf.h
@@ -203,6 +203,8 @@ struct intf_sys_t
     IBOutlet id o_mu_subtitle;
     IBOutlet id o_mi_deinterlace;
     IBOutlet id o_mu_deinterlace;
+    IBOutlet id o_mi_ffmpeg_pp;
+    IBOutlet id o_mu_ffmpeg_pp;
 
     IBOutlet id o_mu_window;
     IBOutlet id o_mi_minimize;

diff --git a/modules/gui/macosx/intf.m b/modules/gui/macosx/intf.m
index 6be12e037246de67a6e143bce8a140f93b3bfd43..6258a5509be4d9392ab5a0d00b738b4a5642eab0 100644 (file)
--- a/modules/gui/macosx/intf.m
+++ b/modules/gui/macosx/intf.m
@@ -464,6 +464,8 @@ static VLCMain *_o_sharedMainInstance = nil;
     [o_mu_subtitle setTitle: _NS("Subtitles Track")];
     [o_mi_deinterlace setTitle: _NS("Deinterlace")];
     [o_mu_deinterlace setTitle: _NS("Deinterlace")];
+    [o_mi_ffmpeg_pp setTitle: _NS("Post processing")];
+    [o_mu_ffmpeg_pp setTitle: _NS("Post processing")];
 
     [o_mu_window setTitle: _NS("Window")];
     [o_mi_minimize setTitle: _NS("Minimize Window")];
@@ -985,11 +987,26 @@ static VLCMain *_o_sharedMainInstance = nil;
 
             if ( p_vout != NULL )
             {
+                vlc_object_t * p_dec_obj;
+
                 [o_controls setupVarMenuItem: o_mi_screen target: (vlc_object_t *)p_vout
                     var: "video-device" selector: @selector(toggleVar:)];
 
                 [o_controls setupVarMenuItem: o_mi_deinterlace target: (vlc_object_t *)p_vout
                     var: "deinterlace" selector: @selector(toggleVar:)];
+
+                p_dec_obj = (vlc_object_t *)vlc_object_find(
+                                                     (vlc_object_t *)p_vout,
+                                                     VLC_OBJECT_DECODER,
+                                                     FIND_PARENT );
+                if ( p_dec_obj != NULL )
+                {
+                   [o_controls setupVarMenuItem: o_mi_ffmpeg_pp target:
+                        (vlc_object_t *)p_dec_obj var:"ffmpeg-pp-q" selector:
+                        @selector(toggleVar:)];
+
+                    vlc_object_release(p_dec_obj);
+                }
                 vlc_object_release( (vlc_object_t *)p_vout );
             }
         }
@@ -1111,6 +1128,7 @@ static VLCMain *_o_sharedMainInstance = nil;
     [o_mi_subtitle setEnabled: b_enabled];
     [o_mi_channels setEnabled: b_enabled];
     [o_mi_deinterlace setEnabled: b_enabled];
+    [o_mi_ffmpeg_pp setEnabled: b_enabled];
     [o_mi_device setEnabled: b_enabled];
     [o_mi_screen setEnabled: b_enabled];
 }