Commit 03d18c98 authored by Derk-Jan Hartman's avatar Derk-Jan Hartman

* modules/gui/macosx/*: Commit of the Visualizations menu item.

* ALL: bring the project files to XCode.
  10.2 users should revert the change in Makefile.am or they won't be able to
  build VLC on their machine. Editing the project files will probably also not
  be possible for them.
parent 9a1da9ef
...@@ -453,7 +453,7 @@ VLC.app: vlc ...@@ -453,7 +453,7 @@ VLC.app: vlc
cp "$(srcdir)/modules/gui/macosx/$$i" \ cp "$(srcdir)/modules/gui/macosx/$$i" \
$(top_builddir)/tmp/modules/gui/macosx; \ $(top_builddir)/tmp/modules/gui/macosx; \
done done
cd $(top_builddir)/tmp/extras/MacOSX && pbxbuild -target vlc | grep -v '^\([ \t]\|$$\)' cd $(top_builddir)/tmp/extras/MacOSX && xcodebuild -target vlc | grep -v '^\([ \t]\|$$\)'
cp -r $(top_builddir)/tmp/extras/MacOSX/build/vlc.bundle \ cp -r $(top_builddir)/tmp/extras/MacOSX/build/vlc.bundle \
$(top_builddir)/VLC.app $(top_builddir)/VLC.app
rm -Rf $(top_builddir)/tmp rm -Rf $(top_builddir)/tmp
......
...@@ -144,6 +144,7 @@ ...@@ -144,6 +144,7 @@
"o_mi_subtitle" = id; "o_mi_subtitle" = id;
"o_mi_title" = id; "o_mi_title" = id;
"o_mi_videotrack" = id; "o_mi_videotrack" = id;
"o_mi_visual" = id;
"o_mi_vol_down" = id; "o_mi_vol_down" = id;
"o_mi_vol_up" = id; "o_mi_vol_up" = id;
"o_mi_website" = id; "o_mi_website" = id;
...@@ -165,6 +166,7 @@ ...@@ -165,6 +166,7 @@
"o_mu_title" = id; "o_mu_title" = id;
"o_mu_video" = id; "o_mu_video" = id;
"o_mu_videotrack" = id; "o_mu_videotrack" = id;
"o_mu_visual" = id;
"o_mu_window" = id; "o_mu_window" = id;
"o_playlist" = id; "o_playlist" = id;
"o_prefs" = id; "o_prefs" = id;
......
...@@ -3,25 +3,29 @@ ...@@ -3,25 +3,29 @@
<plist version="1.0"> <plist version="1.0">
<dict> <dict>
<key>IBDocumentLocation</key> <key>IBDocumentLocation</key>
<string>32 550 365 441 0 0 1280 1002 </string> <string>23 160 772 722 0 0 1280 1002 </string>
<key>IBEditorPositions</key> <key>IBEditorPositions</key>
<dict> <dict>
<key>29</key> <key>29</key>
<string>431 891 419 44 0 0 1280 1002 </string> <string>430 938 419 44 0 0 1280 1002 </string>
<key>303</key> <key>303</key>
<string>60 509 104 114 0 0 1280 1002 </string> <string>259 604 104 118 0 0 1280 1002 </string>
<key>909</key> <key>909</key>
<string>72 297 430 172 0 0 1152 746 </string> <string>72 297 430 172 0 0 1152 746 </string>
<key>915</key> <key>915</key>
<string>439 657 93 96 0 0 1280 1002 </string> <string>439 657 93 99 0 0 1280 1002 </string>
</dict> </dict>
<key>IBFramework Version</key> <key>IBFramework Version</key>
<string>291.0</string> <string>349.0</string>
<key>IBLockedObjects</key> <key>IBLockedObjects</key>
<array> <array>
<integer>977</integer> <integer>977</integer>
</array> </array>
<key>IBOpenObjects</key>
<array>
<integer>29</integer>
</array>
<key>IBSystem Version</key> <key>IBSystem Version</key>
<string>6R73</string> <string>7B85</string>
</dict> </dict>
</plist> </plist>
This diff is collapsed.
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* intf.h: MacOS X interface plugin * intf.h: MacOS X interface plugin
***************************************************************************** *****************************************************************************
* Copyright (C) 2002-2003 VideoLAN * Copyright (C) 2002-2003 VideoLAN
* $Id: intf.h,v 1.46 2003/10/29 02:13:04 hartman Exp $ * $Id: intf.h,v 1.47 2003/11/03 15:27:28 hartman Exp $
* *
* Authors: Jon Lech Johansen <jon-vl@nanocrew.net> * Authors: Jon Lech Johansen <jon-vl@nanocrew.net>
* Christophe Massiot <massiot@via.ecp.fr> * Christophe Massiot <massiot@via.ecp.fr>
...@@ -183,6 +183,8 @@ struct intf_sys_t ...@@ -183,6 +183,8 @@ struct intf_sys_t
IBOutlet id o_mu_channels; IBOutlet id o_mu_channels;
IBOutlet id o_mi_device; IBOutlet id o_mi_device;
IBOutlet id o_mu_device; IBOutlet id o_mu_device;
IBOutlet id o_mi_visual;
IBOutlet id o_mu_visual;
IBOutlet id o_mu_video; IBOutlet id o_mu_video;
IBOutlet id o_mi_half_window; IBOutlet id o_mi_half_window;
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* intf.m: MacOS X interface plugin * intf.m: MacOS X interface plugin
***************************************************************************** *****************************************************************************
* Copyright (C) 2002-2003 VideoLAN * Copyright (C) 2002-2003 VideoLAN
* $Id: intf.m,v 1.97 2003/10/29 02:13:04 hartman Exp $ * $Id: intf.m,v 1.98 2003/11/03 15:27:28 hartman Exp $
* *
* Authors: Jon Lech Johansen <jon-vl@nanocrew.net> * Authors: Jon Lech Johansen <jon-vl@nanocrew.net>
* Christophe Massiot <massiot@via.ecp.fr> * Christophe Massiot <massiot@via.ecp.fr>
...@@ -419,6 +419,8 @@ int CocoaConvertKey( unichar i_key ) ...@@ -419,6 +419,8 @@ int CocoaConvertKey( unichar i_key )
[o_mu_channels setTitle: _NS("Audio channels")]; [o_mu_channels setTitle: _NS("Audio channels")];
[o_mi_device setTitle: _NS("Audio device")]; [o_mi_device setTitle: _NS("Audio device")];
[o_mu_device setTitle: _NS("Audio device")]; [o_mu_device setTitle: _NS("Audio device")];
[o_mi_visual setTitle: _NS("Visualizations")];
[o_mu_visual setTitle: _NS("Visualizations")];
[o_mu_video setTitle: _NS("Video")]; [o_mu_video setTitle: _NS("Video")];
[o_mi_half_window setTitle: _NS("Half Size")]; [o_mi_half_window setTitle: _NS("Half Size")];
...@@ -779,6 +781,9 @@ int CocoaConvertKey( unichar i_key ) ...@@ -779,6 +781,9 @@ int CocoaConvertKey( unichar i_key )
[o_controls setupVarMenuItem: o_mi_device target: (vlc_object_t *)p_aout [o_controls setupVarMenuItem: o_mi_device target: (vlc_object_t *)p_aout
var: "audio-device" selector: @selector(toggleVar:)]; var: "audio-device" selector: @selector(toggleVar:)];
[o_controls setupVarMenuItem: o_mi_visual target: (vlc_object_t *)p_aout
var: "visual" selector: @selector(toggleVar:)];
vlc_object_release( (vlc_object_t *)p_aout ); vlc_object_release( (vlc_object_t *)p_aout );
} }
......
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