Removed broken, unmaintained and unfinished code. May be restored after 0.9.0...

Removed broken, unmaintained and unfinished code. May be restored after 0.9.0 if there is enough time to do this kind of stuff (should be merged with the Extended Controls panel anyway)

extras/package/macosx/Resources/English.lproj/MainMenu.nib/info.nib

@@ -2,23 +2,34 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
+	<key>IBDocumentLocation</key>
+	<string>31 299 356 240 0 0 1280 778 </string>
+	<key>IBEditorPositions</key>
+	<dict>
+		<key>2197</key>
+		<string>342 506 596 123 0 0 1280 778 </string>
+		<key>29</key>
+		<string>69 316 438 44 0 0 1280 778 </string>
+		<key>915</key>
+		<string>69 316 187 285 0 0 1280 778 </string>
+	</dict>
 	<key>IBFramework Version</key>
-	<string>667</string>
+	<string>489.0</string>
 	<key>IBLastKnownRelativeProjectPath</key>
 	<string>../../vlc.xcodeproj</string>
 	<key>IBOldestOS</key>
 	<integer>5</integer>
 	<key>IBOpenObjects</key>
 	<array>
-		<integer>2197</integer>
+		<integer>282</integer>
 		<integer>915</integer>
 		<integer>2416</integer>
-		<integer>282</integer>
 		<integer>29</integer>
+		<integer>2197</integer>
 		<integer>21</integer>
 	</array>
 	<key>IBSystem Version</key>
-	<string>9D34</string>
+	<string>9E17</string>
 	<key>targetFramework</key>
 	<string>IBCocoaFramework</string>
 </dict>

extras/package/macosx/Resources/English.lproj/SFilters.nib/classes.nib

-{
-    IBClasses = (
-        {CLASS = FirstResponder; LANGUAGE = ObjC; SUPERCLASS = NSObject; }, 
-        {
-            ACTIONS = {enableFilter = id; "logo_selectFile" = id; propertyChanged = id; }; 
-            CLASS = VLCsFilters; 
-            LANGUAGE = ObjC; 
-            OUTLETS = {
-                "o_logo_enabled_ckb" = id; 
-                "o_logo_image_btn" = id; 
-                "o_logo_image_fld" = id; 
-                "o_logo_image_lbl" = id; 
-                "o_logo_opaque_lbl" = id; 
-                "o_logo_opaque_sld" = id; 
-                "o_logo_pos_lbl" = id; 
-                "o_logo_pos_radio" = id; 
-                "o_marq_color_lbl" = id; 
-                "o_marq_color_pop" = id; 
-                "o_marq_enabled_ckb" = id; 
-                "o_marq_marq_fld" = id; 
-                "o_marq_marq_lbl" = id; 
-                "o_marq_opaque_lbl" = id; 
-                "o_marq_opaque_sld" = id; 
-                "o_marq_pos_lbl" = id; 
-                "o_marq_pos_radio" = id; 
-                "o_marq_size_inPx_lbl" = id; 
-                "o_marq_size_lbl" = id; 
-                "o_marq_size_pop" = id; 
-                "o_marq_tmOut_fld" = id; 
-                "o_marq_tmOut_lbl" = id; 
-                "o_marq_tmOut_ms_lbl" = id; 
-                "o_sfilter_saveSettings_ckb" = id; 
-                "o_sfilter_tabView" = id; 
-                "o_sfilter_win" = id; 
-                "o_time_color_lbl" = id; 
-                "o_time_color_pop" = id; 
-                "o_time_enabled_ckb" = id; 
-                "o_time_opaque_lbl" = id; 
-                "o_time_opaque_sld" = id; 
-                "o_time_pos_lbl" = id; 
-                "o_time_pos_radio" = id; 
-                "o_time_size_inPx_lbl" = id; 
-                "o_time_size_lbl" = id; 
-                "o_time_size_pop" = id; 
-                "o_time_stamp_fld" = id; 
-                "o_time_stamp_lbl" = id; 
-            }; 
-            SUPERCLASS = NSObject; 
-        }
-    ); 
-    IBVersion = 1; 
-}
\ No newline at end of file

extras/package/macosx/Resources/English.lproj/SFilters.nib/info.nib

-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>IBDocumentLocation</key>
-	<string>63 19 356 240 0 0 1440 878 </string>
-	<key>IBFramework Version</key>
-	<string>446.1</string>
-	<key>IBOpenObjects</key>
-	<array>
-		<integer>5</integer>
-	</array>
-	<key>IBSystem Version</key>
-	<string>8I127</string>
-</dict>
-</plist>

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

@@ -75,7 +75,6 @@
 		CC402EF10E00ABBB006A4BA4 /* Extended.nib in Resources */ = {isa = PBXBuildFile; fileRef = DC7F46EB08A183FC0027DB24 /* Extended.nib */; };
 		CC402EF20E00ABBB006A4BA4 /* Bookmarks.nib in Resources */ = {isa = PBXBuildFile; fileRef = DCE7BD0308A56C8B007B10AE /* Bookmarks.nib */; };
 		CC402EF30E00ABBB006A4BA4 /* about_bg.png in Resources */ = {isa = PBXBuildFile; fileRef = DCDA5E6408F94518009D93A8 /* about_bg.png */; };
-		CC402EF40E00ABBB006A4BA4 /* SFilters.nib in Resources */ = {isa = PBXBuildFile; fileRef = CCF3C64A0923B99D00401862 /* SFilters.nib */; };
 		CC402EF50E00ABBB006A4BA4 /* skip_forward_active_embedded.png in Resources */ = {isa = PBXBuildFile; fileRef = C2F2A6FA0958A6E600018C74 /* skip_forward_active_embedded.png */; };
 		CC402EF60E00ABBB006A4BA4 /* play_embedded.png in Resources */ = {isa = PBXBuildFile; fileRef = C2F2A6FC0958A94500018C74 /* play_embedded.png */; };
 		CC402EF70E00ABBB006A4BA4 /* pause_embedded.png in Resources */ = {isa = PBXBuildFile; fileRef = C2F2A6FE0958AA9300018C74 /* pause_embedded.png */; };
@@ -233,8 +232,8 @@
 		8ED6C27E03E2EB1C0059A3A7 /* macosx.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = macosx.m; path = ../../../modules/gui/macosx/macosx.m; sourceTree = SOURCE_ROOT; };
 		8ED6C27F03E2EB1C0059A3A7 /* misc.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = misc.h; path = ../../../modules/gui/macosx/misc.h; sourceTree = SOURCE_ROOT; };
 		8ED6C28003E2EB1C0059A3A7 /* misc.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = misc.m; path = ../../../modules/gui/macosx/misc.m; sourceTree = SOURCE_ROOT; };
-		8ED6C28103E2EB1C0059A3A7 /* open.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = open.h; path = ../../../modules/gui/macosx/open.h; sourceTree = SOURCE_ROOT; };
-		8ED6C28203E2EB1C0059A3A7 /* open.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = open.m; path = ../../../modules/gui/macosx/open.m; sourceTree = SOURCE_ROOT; };
+		8ED6C28103E2EB1C0059A3A7 /* open.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = open.h; path = ../../../modules/gui/macosx/open.h; sourceTree = SOURCE_ROOT; };
+		8ED6C28203E2EB1C0059A3A7 /* open.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = open.m; path = ../../../modules/gui/macosx/open.m; sourceTree = SOURCE_ROOT; };
 		8ED6C28303E2EB1C0059A3A7 /* playlist.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = playlist.h; path = ../../../modules/gui/macosx/playlist.h; sourceTree = SOURCE_ROOT; };
 		8ED6C28403E2EB1C0059A3A7 /* playlist.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = playlist.m; path = ../../../modules/gui/macosx/playlist.m; sourceTree = SOURCE_ROOT; };
 		8ED6C28503E2EB1C0059A3A7 /* prefs.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = prefs.h; path = ../../../modules/gui/macosx/prefs.h; sourceTree = SOURCE_ROOT; };
@@ -287,7 +286,6 @@
 		CC33C24F0D2578F5008C4683 /* volumeslider_graphite.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = volumeslider_graphite.png; path = Resources/volumeslider_graphite.png; sourceTree = "<group>"; };
 		CC33C2500D2578F5008C4683 /* fullscreen_graphite.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = fullscreen_graphite.png; path = Resources/fullscreen_graphite.png; sourceTree = "<group>"; };
 		CC3DC89B0A7CDB9600B53F32 /* ApplicationServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ApplicationServices.framework; path = /System/Library/Frameworks/ApplicationServices.framework; sourceTree = "<absolute>"; };
-		CC402F4A0E00ABBB006A4BA4 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		CC402F4B0E00ABBB006A4BA4 /* VLC.bundle */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = VLC.bundle; sourceTree = BUILT_PRODUCTS_DIR; };
 		CC4ED9AC0ABE07C800CA4CC5 /* add_embedded_blue.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = add_embedded_blue.png; path = Resources/add_embedded_blue.png; sourceTree = "<group>"; };
 		CC4ED9AD0ABE07C800CA4CC5 /* add_embedded.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = add_embedded.png; path = Resources/add_embedded.png; sourceTree = "<group>"; };
@@ -353,9 +351,6 @@
 		CCCB86D80ACFDFB300CF1E10 /* fs_stop_highlight.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = fs_stop_highlight.png; path = Resources/fs_stop_highlight.png; sourceTree = "<group>"; };
 		CCCB86D90ACFDFB300CF1E10 /* fs_stop.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = fs_stop.png; path = Resources/fs_stop.png; sourceTree = "<group>"; };
 		CCCB86DA0ACFDFB300CF1E10 /* fs_background.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = fs_background.png; path = Resources/fs_background.png; sourceTree = "<group>"; };
-		CCF3C64B0923B99D00401862 /* English */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = English; path = Resources/English.lproj/SFilters.nib; sourceTree = "<group>"; };
-		CCF3C6500923B9D100401862 /* sfilters.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = sfilters.h; path = ../../../modules/gui/macosx/sfilters.h; sourceTree = SOURCE_ROOT; };
-		CCF3C6510923B9D100401862 /* sfilters.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = sfilters.m; path = ../../../modules/gui/macosx/sfilters.m; sourceTree = SOURCE_ROOT; };
 		DC769AB7085DF0DB001A838D /* wizard.m */ = {isa = PBXFileReference; fileEncoding = 5; indentWidth = 4; lastKnownFileType = sourcecode.c.objc; name = wizard.m; path = ../../../modules/gui/macosx/wizard.m; sourceTree = SOURCE_ROOT; tabWidth = 4; usesTabs = 0; };
 		DC769AB8085DF0DB001A838D /* wizard.h */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.h; name = wizard.h; path = ../../../modules/gui/macosx/wizard.h; sourceTree = SOURCE_ROOT; };
 		DC7F46EC08A183FC0027DB24 /* English */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = English; path = Resources/English.lproj/Extended.nib; sourceTree = "<group>"; };
@@ -404,7 +399,6 @@
 				089C167CFE841241C02AAC07 /* Resources */,
 				089C1671FE841209C02AAC07 /* Frameworks and Libraries */,
 				19C28FB8FE9D52D311CA2CBB /* Products */,
-				CC402F4A0E00ABBB006A4BA4 /* Info.plist */,
 			);
 			name = vlc;
 			sourceTree = "<group>";
@@ -476,8 +470,6 @@
 				DC7F46F108A187F60027DB24 /* extended.m */,
 				DCE7BD0708A5724D007B10AE /* bookmarks.h */,
 				DCE7BD0608A5724D007B10AE /* bookmarks.m */,
-				CCF3C6500923B9D100401862 /* sfilters.h */,
-				CCF3C6510923B9D100401862 /* sfilters.m */,
 				CC26BF3109A7A08C00E94D62 /* update.h */,
 				CC26BF3209A7A08C00E94D62 /* update.m */,
 				CC6D8D9C0A878DED006F2BBE /* AppleRemote.h */,
@@ -750,7 +742,6 @@
 				DCFCCDB7085CE18F001E36AF /* Wizard.nib */,
 				DC7F46EB08A183FC0027DB24 /* Extended.nib */,
 				DCE7BD0308A56C8B007B10AE /* Bookmarks.nib */,
-				CCF3C64A0923B99D00401862 /* SFilters.nib */,
 				CC26BF2A09A7A05000E94D62 /* Update.nib */,
 				CC1B4B4B09A8CF9E0078AD2E /* Interaction.nib */,
 				CC1AC1BA0A7BDA41002478C3 /* InteractionErrorPanel.nib */,
@@ -869,7 +860,6 @@
 				CC402EF10E00ABBB006A4BA4 /* Extended.nib in Resources */,
 				CC402EF20E00ABBB006A4BA4 /* Bookmarks.nib in Resources */,
 				CC402EF30E00ABBB006A4BA4 /* about_bg.png in Resources */,
-				CC402EF40E00ABBB006A4BA4 /* SFilters.nib in Resources */,
 				CC402EF50E00ABBB006A4BA4 /* skip_forward_active_embedded.png in Resources */,
 				CC402EF60E00ABBB006A4BA4 /* play_embedded.png in Resources */,
 				CC402EF70E00ABBB006A4BA4 /* pause_embedded.png in Resources */,
@@ -993,14 +983,6 @@
 			name = MediaInfo.nib;
 			sourceTree = "<group>";
 		};
-		CCF3C64A0923B99D00401862 /* SFilters.nib */ = {
-			isa = PBXVariantGroup;
-			children = (
-				CCF3C64B0923B99D00401862 /* English */,
-			);
-			name = SFilters.nib;
-			sourceTree = "<group>";
-		};
 		DC7F46EB08A183FC0027DB24 /* Extended.nib */ = {
 			isa = PBXVariantGroup;
 			children = (
@@ -1124,7 +1106,7 @@
 				GCC_ENABLE_FIX_AND_CONTINUE = NO;
 				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
 				HEADER_SEARCH_PATHS = "";
-				INFOPLIST_FILE = "Info.plist";
+				INFOPLIST_FILE = Info.plist;
 				INSTALL_PATH = "$(HOME)/Library/Bundles";
 				JAVAC_SOURCE_FILE_ENCODING = "ISO-8859-1";
 				LIBRARY_SEARCH_PATHS = /Volumes/Genitus/vlc/modules/gui/macosx;
@@ -1149,7 +1131,7 @@
 				FRAMEWORK_SEARCH_PATHS = "";
 				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
 				HEADER_SEARCH_PATHS = "";
-				INFOPLIST_FILE = "Info.plist";
+				INFOPLIST_FILE = Info.plist;
 				INSTALL_PATH = "$(HOME)/Library/Bundles";
 				JAVAC_SOURCE_FILE_ENCODING = "ISO-8859-1";
 				LIBRARY_SEARCH_PATHS = /Volumes/Genitus/vlc/modules/gui/macosx;

modules/gui/macosx/Modules.am

@@ -47,8 +47,6 @@ SOURCES_macosx = \
 	extended.m \
 	bookmarks.h \
 	bookmarks.m \
-	sfilters.h \
-	sfilters.m \
 	embeddedwindow.h \
 	embeddedwindow.m \
 	fspanel.m \

modules/gui/macosx/intf.h

@@ -109,7 +109,6 @@ struct intf_sys_t
     id o_bookmarks;             /* VLCBookmarks   */
     id o_embedded_list;         /* VLCEmbeddedList*/
     id o_interaction_list;      /* VLCInteractionList*/
-    id o_sfilters;              /* VLCsFilters    */
     id o_info;                  /* VLCInformation */
 #ifdef UPDATE_CHECK
     id o_update;                /* VLCUpdate      */
@@ -121,7 +120,6 @@ struct intf_sys_t
     BOOL nib_wizard_loaded;     /* wizard nibfile */
     BOOL nib_extended_loaded;   /* extended nibfile */
     BOOL nib_bookmarks_loaded;  /* bookmarks nibfile */
-    BOOL nib_sfilters_loaded;   /* sfilters nibfile */
     BOOL nib_prefs_loaded;      /* preferences nibfile */
     BOOL nib_update_loaded;     /* update nibfile */
     BOOL nib_info_loaded;       /* information panel nibfile */
@@ -366,7 +364,6 @@ struct intf_sys_t
 - (IBAction)showWizard:(id)sender;
 - (IBAction)showExtended:(id)sender;
 - (IBAction)showBookmarks:(id)sender;
-- (IBAction)showSFilters:(id)sender;
 
 - (IBAction)viewAbout:(id)sender;
 - (IBAction)showLicense:(id)sender;

modules/gui/macosx/intf.m

@@ -48,7 +48,6 @@
 #import "wizard.h"
 #import "extended.h"
 #import "bookmarks.h"
-#import "sfilters.h"
 #import "interaction.h"
 #import "embeddedwindow.h"
 #import "update.h"
@@ -351,7 +350,6 @@ static VLCMain *_o_sharedMainInstance = nil;
     o_embedded_list = [[VLCEmbeddedList alloc] init];
     o_interaction_list = [[VLCInteractionList alloc] init];
     o_info = [[VLCInfo alloc] init];
-    o_sfilters = nil;
 #ifdef UPDATE_CHECK
     o_update = [[VLCUpdate alloc] init];
 #endif
@@ -1886,22 +1884,6 @@ end:
     [o_extended showPanel];
 }
 
-- (IBAction)showSFilters:(id)sender
-{
-    if( o_sfilters == nil )
-    {
-        o_sfilters = [[VLCsFilters alloc] init];
-    }
-    if( !nib_sfilters_loaded )
-    {
-        nib_sfilters_loaded = [NSBundle loadNibNamed:@"SFilters" owner:self];
-        [o_sfilters initStrings];
-        [o_sfilters showAsPanel];
-    } else {
-        [o_sfilters showAsPanel];
-    }
-}
-
 - (IBAction)showBookmarks:(id)sender
 {
     /* we need the wizard-nib for the bookmarks's extract functionality */

modules/gui/macosx/sfilters.h

-/*****************************************************************************
- * sfilter.h: MacOS X Subpicture filters dialogue
- *****************************************************************************
- * Copyright (C) 2005-2008 the VideoLAN team
- * $Id$
- *
- * Authors: Felix Paul Kühne <fkuehne -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.
- *****************************************************************************/
-
-#import <Cocoa/Cocoa.h>
-#import "intf.h"
-#import <vlc_common.h>
-
-@interface VLCsFilters : NSObject
-{
-    /* window stuff */
-    IBOutlet id o_sfilter_tabView;
-    IBOutlet id o_sfilter_win;
-    IBOutlet id o_sfilter_saveSettings_ckb;
-
-    /* logo section */
-    IBOutlet id o_logo_enabled_ckb;
-    IBOutlet id o_logo_image_btn;
-    IBOutlet id o_logo_image_fld;
-    IBOutlet id o_logo_image_lbl;
-    IBOutlet id o_logo_opaque_lbl;
-    IBOutlet id o_logo_opaque_sld;
-    IBOutlet id o_logo_pos_lbl;
-    IBOutlet id o_logo_pos_radio;
-
-    /* marquee section */
-    IBOutlet id o_marq_enabled_ckb;
-    IBOutlet id o_marq_color_lbl;
-    IBOutlet id o_marq_color_pop;
-    IBOutlet id o_marq_marq_fld;
-    IBOutlet id o_marq_marq_lbl;
-    IBOutlet id o_marq_opaque_lbl;
-    IBOutlet id o_marq_opaque_sld;
-    IBOutlet id o_marq_pos_lbl;
-    IBOutlet id o_marq_pos_radio;
-    IBOutlet id o_marq_size_inPx_lbl;
-    IBOutlet id o_marq_size_lbl;
-    IBOutlet id o_marq_size_pop;
-    IBOutlet id o_marq_tmOut_fld;
-    IBOutlet id o_marq_tmOut_lbl;
-    IBOutlet id o_marq_tmOut_ms_lbl;
-
-    /* time section */
-    IBOutlet id o_time_enabled_ckb;
-    IBOutlet id o_time_color_lbl;
-    IBOutlet id o_time_color_pop;
-    IBOutlet id o_time_opaque_lbl;
-    IBOutlet id o_time_opaque_sld;
-    IBOutlet id o_time_pos_lbl;
-    IBOutlet id o_time_pos_radio;
-    IBOutlet id o_time_size_inPx_lbl;
-    IBOutlet id o_time_size_lbl;
-    IBOutlet id o_time_size_pop;
-    IBOutlet id o_time_stamp_fld;
-    IBOutlet id o_time_stamp_lbl;
-
-    BOOL o_config_changed;
-    BOOL o_save_settings;
-    NSArray * o_colors;
-}
-
-
-+ (VLCsFilters *)sharedInstance;
-- (IBAction)logo_selectFile:(id)sender;
-- (IBAction)propertyChanged:(id)sender;
-- (IBAction)enableFilter:(id)sender;
-
-- (void)showAsPanel;
-- (void)initStrings;
-- (void)changeFiltersString: (char *)psz_name onOrOff: (bool )b_add;
-- (void)enableTime;
-- (void)enableLogo;
-- (void)enableMarq;
-
-@end