macosx: remove dead code and rename vout.* to VideoView.*

Makefile.am

@@ -475,19 +475,14 @@ VLC-release.app: vlc
 	    prefs.m \
 	    simple_prefs.h \
 	    simple_prefs.m \
-	    vout.h \
-	    voutgl.m \
 	    wizard.h \
 	    wizard.m \
 	    bookmarks.h \
 	    bookmarks.m \
 	    coredialogs.h \
 	    coredialogs.m \
-	    embeddedwindow.h \
-	    embeddedwindow.m \
 	    fspanel.h \
-	    fspanel.m \
-	    vout.m; do \
+	    fspanel.m; do \
 	  cp "$(srcdir)/modules/gui/macosx/$$i" \
              $(top_builddir)/tmp/modules/gui/macosx; \
 	done
@@ -608,19 +603,14 @@ VLC.app: vlc $(top_builddir)/src/.libs/libvlccore.dylib $(top_builddir)/lib/.lib
 	    prefs.m \
 	    simple_prefs.h \
 	    simple_prefs.m \
-	    vout.h \
-	    voutgl.m \
 	    wizard.h \
 	    wizard.m \
 	    bookmarks.h \
 	    bookmarks.m \
 	    coredialogs.h \
 	    coredialogs.m \
-	    embeddedwindow.h \
-	    embeddedwindow.m \
 	    fspanel.h \
-	    fspanel.m \
-	    vout.m; do \
+	    fspanel.m; do \
 	  cp "$(srcdir)/modules/gui/macosx/$$i" \
              $(top_builddir)/tmp/modules/gui/macosx; \
 	done

extras/package/macosx/vlc.xcodeproj/project.pbxproj

@@ -239,7 +239,6 @@
 		8E6BC6FA041684EC0059A3A7 /* controls.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = controls.h; path = ../../../modules/gui/macosx/controls.h; sourceTree = SOURCE_ROOT; };
 		8E9CA1A306D7DEE800B7186C /* prefs_widgets.h */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.h; name = prefs_widgets.h; path = ../../../modules/gui/macosx/prefs_widgets.h; sourceTree = SOURCE_ROOT; };
 		8E9CA1A406D7DEE800B7186C /* prefs_widgets.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = prefs_widgets.m; path = ../../../modules/gui/macosx/prefs_widgets.m; sourceTree = SOURCE_ROOT; };
-		8E9CA1A506D7DEE800B7186C /* voutgl.m */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.objc; name = voutgl.m; path = ../../../modules/gui/macosx/voutgl.m; sourceTree = SOURCE_ROOT; };
 		8EBF3FA303F13FFB0059A3A7 /* vlc.scriptSuite */ = {isa = PBXFileReference; lastKnownFileType = text; name = vlc.scriptSuite; path = Resources/vlc.scriptSuite; sourceTree = SOURCE_ROOT; };
 		8EBF3FA503F140960059A3A7 /* vlc.scriptTerminology */ = {isa = PBXFileReference; lastKnownFileType = text.xml; name = vlc.scriptTerminology; path = Resources/vlc.scriptTerminology; sourceTree = SOURCE_ROOT; };
 		8ED6C27B03E2EB1C0059A3A7 /* controls.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = controls.m; path = ../../../modules/gui/macosx/controls.m; sourceTree = SOURCE_ROOT; };
@@ -254,8 +253,6 @@
 		8ED6C28403E2EB1C0059A3A7 /* playlist.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = playlist.m; path = ../../../modules/gui/macosx/playlist.m; sourceTree = SOURCE_ROOT; };
 		8ED6C28503E2EB1C0059A3A7 /* prefs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = prefs.h; path = ../../../modules/gui/macosx/prefs.h; sourceTree = SOURCE_ROOT; };
 		8ED6C28603E2EB1C0059A3A7 /* prefs.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = prefs.m; path = ../../../modules/gui/macosx/prefs.m; sourceTree = SOURCE_ROOT; };
-		8ED6C28703E2EB1C0059A3A7 /* vout.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = vout.h; path = ../../../modules/gui/macosx/vout.h; sourceTree = SOURCE_ROOT; };
-		8ED6C28803E2EB1C0059A3A7 /* vout.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = vout.m; path = ../../../modules/gui/macosx/vout.m; sourceTree = SOURCE_ROOT; };
 		8EDAC3430440F72D0059A3A7 /* README.MacOSX.rtf */ = {isa = PBXFileReference; lastKnownFileType = text.rtf; path = README.MacOSX.rtf; sourceTree = SOURCE_ROOT; };
 		8EE1AF9F044465080059A3A7 /* about.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = about.h; path = ../../../modules/gui/macosx/about.h; sourceTree = SOURCE_ROOT; };
 		8EE1AFA0044465080059A3A7 /* about.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = about.m; path = ../../../modules/gui/macosx/about.m; sourceTree = SOURCE_ROOT; };
@@ -475,9 +472,9 @@
 		CCB24D5D0D54BBAE004D780C /* simple_prefs.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; name = simple_prefs.m; path = ../../../modules/gui/macosx/simple_prefs.m; sourceTree = SOURCE_ROOT; };
 		CCB24D5E0D54BBAE004D780C /* simple_prefs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = simple_prefs.h; path = ../../../modules/gui/macosx/simple_prefs.h; sourceTree = SOURCE_ROOT; };
 		CCBE999E0F922C51000705F8 /* CoreServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreServices.framework; path = /System/Library/Frameworks/CoreServices.framework; sourceTree = "<absolute>"; };
-		CCC593780AB4A9FB0004FF52 /* embeddedwindow.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = embeddedwindow.h; path = ../../../modules/gui/macosx/embeddedwindow.h; sourceTree = SOURCE_ROOT; };
-		CCC593790AB4A9FB0004FF52 /* embeddedwindow.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = embeddedwindow.m; path = ../../../modules/gui/macosx/embeddedwindow.m; sourceTree = SOURCE_ROOT; };
 		CCC895830D9A8A82005AE59C /* eyetv.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = eyetv.m; path = ../../../modules/access/eyetv.m; sourceTree = SOURCE_ROOT; };
+		CCCCDCA01413E1C000FE3DE1 /* VideoView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = VideoView.h; path = ../../../modules/gui/macosx/VideoView.h; sourceTree = "<group>"; };
+		CCCCDCA11413E1C000FE3DE1 /* VideoView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = VideoView.m; path = ../../../modules/gui/macosx/VideoView.m; sourceTree = "<group>"; };
 		CCCDDEEF13E870BB00A35661 /* SideBarItem.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = SideBarItem.h; path = ../../../modules/gui/macosx/SideBarItem.h; sourceTree = "<group>"; };
 		CCCDDEF013E870BB00A35661 /* SideBarItem.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = SideBarItem.m; path = ../../../modules/gui/macosx/SideBarItem.m; sourceTree = "<group>"; };
 		CCCE366D13817E4500694F2A /* VideoEffects.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = VideoEffects.h; path = ../../../modules/gui/macosx/VideoEffects.h; sourceTree = "<group>"; };
@@ -615,15 +612,12 @@
 				8E49720106417F6800370C9F /* playlistinfo.m */,
 				8E55FB7F0459B0FD00FB3317 /* output.h */,
 				8E55FB800459B0FD00FB3317 /* output.m */,
-				8ED6C28703E2EB1C0059A3A7 /* vout.h */,
-				8ED6C28803E2EB1C0059A3A7 /* vout.m */,
-				8E9CA1A506D7DEE800B7186C /* voutgl.m */,
+				CCCCDCA01413E1C000FE3DE1 /* VideoView.h */,
+				CCCCDCA11413E1C000FE3DE1 /* VideoView.m */,
 				DC769AB8085DF0DB001A838D /* wizard.h */,
 				DC769AB7085DF0DB001A838D /* wizard.m */,
 				DCE7BD0708A5724D007B10AE /* bookmarks.h */,
 				DCE7BD0608A5724D007B10AE /* bookmarks.m */,
-				CCC593780AB4A9FB0004FF52 /* embeddedwindow.h */,
-				CCC593790AB4A9FB0004FF52 /* embeddedwindow.m */,
 				2AEF857609A5FEC900130822 /* fspanel.h */,
 				2AEF857709A5FEC900130822 /* fspanel.m */,
 				CC6EDD4F0B9CA2140096068A /* eyetv.h */,

modules/gui/macosx/MainMenu.m

@@ -37,7 +37,7 @@
 #import "coredialogs.h"
 #import "controls.h"
 #import "playlistinfo.h"
-#import "vout.h"
+#import "VideoView.h"
 #import "CoreInteraction.h"
 #import "MainWindow.h"
 

modules/gui/macosx/Modules.am

@@ -54,8 +54,6 @@ SOURCES_macosx = \
 	VideoEffects.m \
 	bookmarks.h \
 	bookmarks.m \
-	embeddedwindow.h \
-	embeddedwindow.m \
 	PXSourceList.h \
 	PXSourceList.m \
 	PXSourceListDataSource.h \
@@ -66,8 +64,7 @@ SOURCES_macosx = \
 	fspanel.h \
 	eyetv.h \
 	eyetv.m \
-	vout.h \
-	vout.m \
-	voutgl.m \
+	VideoView.h \
+	VideoView.m \
 	$(NULL)
 

modules/gui/macosx/vout.h → modules/gui/macosx/VideoView.h

 /*****************************************************************************
- * vout.h: MacOS X video output module
+ * VideoView.h: MacOS X video output module
  *****************************************************************************
  * Copyright (C) 2002-2011 the VideoLAN team
  * $Id$

modules/gui/macosx/vout.m → modules/gui/macosx/VideoView.m

 /*****************************************************************************
- * vout.m: MacOS X video output module
+ * VideoView.m: MacOS X video output module
  *****************************************************************************
  * Copyright (C) 2002-2011 the VideoLAN team
  * $Id$
@@ -32,7 +32,7 @@
 #import <string.h>
 
 #import "intf.h"
-#import "vout.h"
+#import "VideoView.h"
 #import "CoreInteraction.h"
 #import "MainMenu.h"
 #import "MainWindow.h"

modules/gui/macosx/controls.m

@@ -33,7 +33,7 @@
 #include <string.h>
 
 #import "intf.h"
-#import "vout.h"
+#import "VideoView.h"
 #import "open.h"
 #import "controls.h"
 #import "playlist.h"

modules/gui/macosx/embeddedwindow.h

-/*****************************************************************************
- * embeddedwindow.h: MacOS X interface module
- *****************************************************************************
- * Copyright (C) 2005-2007 the VideoLAN team
- * $Id$
- *
- * Authors: Benjamin Pracht <bigben at videolan dot org>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
- *****************************************************************************/
-
-/*****************************************************************************
- * VLCEmbeddedWindow interface
- *****************************************************************************/
-
-#import "CompatibilityFixes.h"
-#import "misc.h"
-
-@interface VLCEmbeddedWindow : NSWindow <NSWindowDelegate, NSAnimationDelegate>
-{
-    IBOutlet id o_btn_backward;
-    IBOutlet id o_btn_forward;
-    IBOutlet id o_btn_fullscreen;
-    IBOutlet id o_btn_equalizer;
-    IBOutlet id o_btn_playlist;
-    IBOutlet id o_btn_play;
-    IBOutlet id o_btn_prev;
-    IBOutlet id o_btn_stop;
-    IBOutlet id o_btn_next;
-    IBOutlet id o_btn_volume_down;
-    IBOutlet id o_volumeslider;
-    IBOutlet id o_btn_volume_up;
-    IBOutlet id o_backgroundimg_right;
-    IBOutlet id o_backgroundimg_middle;
-    IBOutlet id o_timeslider;
-    IBOutlet id o_main_pgbar;
-    IBOutlet id o_time;
-    IBOutlet id o_scrollfield;
-    IBOutlet id o_horizontal_split;
-    IBOutlet id o_vertical_split;
-    IBOutlet id o_videosubview;
-    IBOutlet id o_view;
-    IBOutlet id o_background_view;
-	IBOutlet id o_searchfield;
-	IBOutlet id o_status;
-	IBOutlet id o_playlist;
-	IBOutlet id o_playlist_view;
-	IBOutlet id o_playlist_table;
-	IBOutlet id o_vlc_main;
-    IBOutlet id o_video_view;
-
-    NSImage * o_img_play;
-    NSImage * o_img_play_pressed;
-    NSImage * o_img_pause;
-    NSImage * o_img_pause_pressed;
-
-    VLCWindow       * o_fullscreen_window;
-    NSViewAnimation * o_fullscreen_anim1;
-    NSViewAnimation * o_fullscreen_anim2;
-    NSViewAnimation * o_makekey_anim;
-    NSView          * o_temp_view;
-    /* set to yes if we are fullscreen and all animations are over */
-    BOOL              b_fullscreen;
-    NSRecursiveLock * o_animation_lock;
-
-    BOOL              b_window_is_invisible;
-
-    NSSize videoRatio;
-    NSInteger originalLevel;
-}
-
-- (void)controlTintChanged;
-
-- (id)videoView;
-
-- (void)setTime: (NSString *)o_arg_ime position: (float)f_position;
-- (id)getPgbar;
-- (void)playStatusUpdated: (int)i_status;
-- (void)setSeekable: (BOOL)b_seekable;
-- (void)setStop:(BOOL)b_input;
-- (void)setPrev:(BOOL)b_input;
-- (void)setNext:(BOOL)b_input;
-- (void)setVolumeEnabled:(BOOL)b_input;
-
-- (void)setScrollString:(NSString *)o_string;
-
-- (void)setVolumeSlider:(float)f_level;
-
-- (void)setVideoRatio:(NSSize)ratio;
-
-- (NSView *)mainView;
-
-- (IBAction)togglePlaylist:(id)sender;
-
-- (BOOL)isFullscreen;
-
-- (void)lockFullscreenAnimation;
-- (void)unlockFullscreenAnimation;
-
-- (void)enterFullscreen;
-- (void)leaveFullscreen;
-/* Allows leaving fullscreen by simply fading out the display */
-- (void)leaveFullscreenAndFadeOut: (BOOL)fadeout;
-
-/* private */
-- (void)hasEndedFullscreen;
-- (void)hasBecomeFullscreen;
-
-- (void)setFrameOnMainThread:(NSData*)packedargs;
-@end
-
-/*****************************************************************************
- * embeddedbackground
- *****************************************************************************/
-
-
-@interface embeddedbackground : NSView
-{
-    IBOutlet id o_window;
-    IBOutlet id o_timeslider;
-    IBOutlet id o_main_pgbar;
-    IBOutlet id o_time;
-    IBOutlet id o_scrollfield;
-    IBOutlet id o_searchfield;
-    IBOutlet id o_btn_backward;
-    IBOutlet id o_btn_forward;
-    IBOutlet id o_btn_fullscreen;
-    IBOutlet id o_btn_equalizer;
-    IBOutlet id o_btn_playlist;
-    IBOutlet id o_btn_play;
-    IBOutlet id o_btn_prev;
-    IBOutlet id o_btn_stop;
-    IBOutlet id o_btn_next;
-    IBOutlet id o_btn_volume_down;
-    IBOutlet id o_volumeslider;
-    IBOutlet id o_btn_volume_up;
-    
-    NSPoint dragStart;
-}
-
-@end
-
-/*****************************************************************************
- * statusbar
- *****************************************************************************/
-
-
-@interface statusbar : NSView
-{
-    IBOutlet id o_text;
-	
-	BOOL mainwindow;
-}
-
-@end

modules/gui/macosx/intf.m

@@ -42,7 +42,7 @@
 #import "CompatibilityFixes.h"
 #import "intf.h"
 #import "MainMenu.h"
-#import "vout.h"
+#import "VideoView.h"
 #import "prefs.h"
 #import "playlist.h"
 #import "playlistinfo.h"
@@ -51,7 +51,6 @@
 #import "wizard.h"
 #import "bookmarks.h"
 #import "coredialogs.h"
-#import "embeddedwindow.h"
 #import "AppleRemote.h"
 #import "eyetv.h"
 #import "simple_prefs.h"