[vlc-commits] commit: MacOS: deinterlace != deinterlace-mode (Jean-Baptiste Kempf )

git at videolan.org git at videolan.org
Sat Jun 26 20:35:00 CEST 2010


vlc/vlc-1.1 | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Sat Jun 26 18:25:43 2010 +0200| [520cf5b761c4b01916fe5b3ac1c329d8161f6c2a] | committer: Jean-Baptiste Kempf 

MacOS: deinterlace != deinterlace-mode
(cherry picked from commit eff70d83b83fa453220c4c4383db032f253b5784)

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-1.1.git/?a=commit;h=520cf5b761c4b01916fe5b3ac1c329d8161f6c2a
---

 modules/gui/macosx/intf.m |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/modules/gui/macosx/intf.m b/modules/gui/macosx/intf.m
index b9b0304..42341ea 100644
--- a/modules/gui/macosx/intf.m
+++ b/modules/gui/macosx/intf.m
@@ -697,6 +697,8 @@ static VLCMain *_o_sharedMainInstance = nil;
     [o_mi_subtitle setTitle: _NS("Subtitles Track")];
     [o_mu_subtitle setTitle: _NS("Subtitles Track")];
     [o_mi_addSub setTitle: _NS("Open File...")];
+    [o_mi_deinterlace setTitle: _NS("Deinterlace")];
+    [o_mu_deinterlace setTitle: _NS("Deinterlace")];
     [o_mi_deinterlace_mode setTitle: _NS("Deinterlace Mode")];
     [o_mu_deinterlace_mode setTitle: _NS("Deinterlace Mode")];
     [o_mi_ffmpeg_pp setTitle: _NS("Post processing")];
@@ -1926,6 +1928,9 @@ end:
             [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:)];
+
             [o_controls setupVarMenuItem: o_mi_deinterlace_mode target: (vlc_object_t *)p_vout
                 var: "deinterlace-mode" selector: @selector(toggleVar:)];
 
@@ -2034,6 +2039,7 @@ end:
     [o_mi_videotrack setEnabled: b_enabled];
     [o_mi_subtitle setEnabled: b_enabled];
     [o_mi_channels setEnabled: b_enabled];
+    [o_mi_deinterlace setEnabled: b_enabled];
     [o_mi_deinterlace_mode setEnabled: b_enabled];
     [o_mi_ffmpeg_pp setEnabled: b_enabled];
     [o_mi_device setEnabled: b_enabled];



More information about the vlc-commits mailing list