]> git.sesse.net Git - vlc/commitdiff
macosx: remove incomplete VLM implementation
authorFelix Paul Kühne <fkuehne@videolan.org>
Mon, 25 May 2009 21:42:48 +0000 (23:42 +0200)
committerFelix Paul Kühne <fkuehne@videolan.org>
Mon, 25 May 2009 21:42:48 +0000 (23:42 +0200)
Do not forward-port

extras/package/macosx/Resources/English.lproj/MainMenu.nib/classes.nib
extras/package/macosx/Resources/English.lproj/MainMenu.nib/info.nib
extras/package/macosx/Resources/English.lproj/MainMenu.nib/keyedobjects.nib
extras/package/macosx/Resources/English.lproj/VLM.nib/classes.nib [deleted file]
extras/package/macosx/Resources/English.lproj/VLM.nib/info.nib [deleted file]
extras/package/macosx/Resources/English.lproj/VLM.nib/keyedobjects.nib [deleted file]
modules/gui/macosx/Modules.am
modules/gui/macosx/intf.h
modules/gui/macosx/intf.m
modules/gui/macosx/vlm.h [deleted file]
modules/gui/macosx/vlm.m [deleted file]

index 770c3c072acc43672bc2a62ffbf81ec4cac73ad4..9da669531a96f839a5bef647fead1258df86336d 100644 (file)
                 showInformationPanel = id;
                 showLicense = id;
                 showMessagesPanel = id;
-                showVLM = id;
                 showWizard = id;
                 timeFieldWasClicked = id;
                 timesliderUpdate = id;
                 "o_timefield" = NSTextField;
                 "o_timeslider" = NSSlider;
                 "o_update" = id;
-                "o_vlm" = id;
                 "o_vmi_fullscreen" = NSMenuItem;
                 "o_vmi_mute" = NSMenuItem;
                 "o_vmi_next" = NSMenuItem;
index 62e9195b69f40e55cf6dcf3164e5e660cc252b98..bf7d8ae1b262771a0fdaab86aac2f17ed2ae456c 100644 (file)
        <integer>4</integer>
        <key>IBOpenObjects</key>
        <array>
-               <integer>3568</integer>
-               <integer>2416</integer>
-               <integer>29</integer>
-               <integer>21</integer>
-               <integer>2197</integer>
                <integer>2709</integer>
+               <integer>2197</integer>
+               <integer>21</integer>
+               <integer>29</integer>
+               <integer>2416</integer>
+               <integer>3568</integer>
        </array>
        <key>IBSystem Version</key>
-       <string>9G55</string>
+       <string>9J61</string>
        <key>targetFramework</key>
        <string>IBCocoaFramework</string>
 </dict>
index 5f94edfde667a84d109a84e8f2ecf48b8863ac7f..a43ae8fdd863f6f168ec200db3d894ee2919b3ea 100644 (file)
Binary files a/extras/package/macosx/Resources/English.lproj/MainMenu.nib/keyedobjects.nib and b/extras/package/macosx/Resources/English.lproj/MainMenu.nib/keyedobjects.nib differ
diff --git a/extras/package/macosx/Resources/English.lproj/VLM.nib/classes.nib b/extras/package/macosx/Resources/English.lproj/VLM.nib/classes.nib
deleted file mode 100644 (file)
index 78fdd7b..0000000
+++ /dev/null
@@ -1,72 +0,0 @@
-{
-    IBClasses =     (
-                {
-            CLASS = FirstResponder;
-            LANGUAGE = ObjC;
-            SUPERCLASS = NSObject;
-        },
-                {
-            CLASS = NSDatePicker;
-            LANGUAGE = ObjC;
-            SUPERCLASS = NSControl;
-        },
-                {
-            ACTIONS =             {
-                bcastButtonAction = id;
-                listDoubleClickAction = id;
-                schedButtonAction = id;
-                vodButtonAction = id;
-            };
-            CLASS = VLCVLMController;
-            LANGUAGE = ObjC;
-            OUTLETS =             {
-                "o_bcast_add_btn" = NSButton;
-                "o_bcast_box" = NSBox;
-                "o_bcast_cancel_btn" = NSButton;
-                "o_bcast_enable_ckb" = NSButton;
-                "o_bcast_input_btn" = NSButton;
-                "o_bcast_input_fld" = NSTextField;
-                "o_bcast_loop_ckb" = NSButton;
-                "o_bcast_name_fld" = NSTextField;
-                "o_bcast_output_btn" = NSButton;
-                "o_bcast_output_fld" = NSTextField;
-                "o_bcast_panel" = NSPanel;
-                "o_sched_add_btn" = id;
-                "o_sched_box" = id;
-                "o_sched_cancel_btn" = id;
-                "o_sched_date_datePicker" = NSDatePicker;
-                "o_sched_date_lbl" = NSTextField;
-                "o_sched_input_btn" = NSButton;
-                "o_sched_input_fld" = NSTextField;
-                "o_sched_input_lbl" = NSTextField;
-                "o_sched_name_fld" = NSTextField;
-                "o_sched_name_lbl" = NSTextField;
-                "o_sched_output_btn" = NSButton;
-                "o_sched_output_fld" = NSTextField;
-                "o_sched_output_lbl" = NSTextField;
-                "o_sched_panel" = NSPanel;
-                "o_sched_repeatDelay_datePicker" = NSDatePicker;
-                "o_sched_repeat_fld" = NSTextField;
-                "o_sched_repeat_lbl" = NSTextField;
-                "o_sched_time_box" = id;
-                "o_vlm_list" = NSTableView;
-                "o_vlm_win" = NSWindow;
-                "o_vod_add_btn" = NSButton;
-                "o_vod_box" = id;
-                "o_vod_cancel_btn" = NSButton;
-                "o_vod_input_btn" = NSButton;
-                "o_vod_input_fld" = NSTextField;
-                "o_vod_input_lbl" = NSTextField;
-                "o_vod_loop_ckb" = NSButton;
-                "o_vod_name_fld" = NSTextField;
-                "o_vod_name_lbl" = NSTextField;
-                "o_vod_output_btn" = NSButton;
-                "o_vod_output_fld" = NSTextField;
-                "o_vod_output_lbl" = NSTextField;
-                "o_vod_panel" = NSPanel;
-            };
-            SUPERCLASS = NSObject;
-        }
-    );
-    IBVersion = 1;
-}
\ No newline at end of file
diff --git a/extras/package/macosx/Resources/English.lproj/VLM.nib/info.nib b/extras/package/macosx/Resources/English.lproj/VLM.nib/info.nib
deleted file mode 100644 (file)
index ea3c540..0000000
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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>609 119 356 240 0 0 1280 778 </string>
-       <key>IBFramework Version</key>
-       <string>489.0</string>
-       <key>IBOpenObjects</key>
-       <array>
-               <integer>5</integer>
-               <integer>106</integer>
-               <integer>65</integer>
-               <integer>30</integer>
-       </array>
-       <key>IBSystem Version</key>
-       <string>9E17</string>
-</dict>
-</plist>
diff --git a/extras/package/macosx/Resources/English.lproj/VLM.nib/keyedobjects.nib b/extras/package/macosx/Resources/English.lproj/VLM.nib/keyedobjects.nib
deleted file mode 100644 (file)
index b078329..0000000
Binary files a/extras/package/macosx/Resources/English.lproj/VLM.nib/keyedobjects.nib and /dev/null differ
index 3723e121a981a35d8f230ad860e8f206d0bf14b0..b19129c7ddf8ccf1f9cd8e8365bc91396bade31f 100644 (file)
@@ -52,7 +52,5 @@ SOURCES_macosx = \
        fspanel.h \
        eyetv.h \
        eyetv.m \
-       vlm.h \
-       vlm.m \
        $(NULL)
 
index d983f822dfb05b61b059a3562613efc071cfaf25..f0e87d246489be4ccfc6b104ec4f0a2e665c01e1 100644 (file)
@@ -102,7 +102,6 @@ struct intf_sys_t
     id o_wizard;                /* VLCWizard      */
     id o_extended;              /* VLCExtended    */
     id o_bookmarks;             /* VLCBookmarks   */
-    id o_vlm;                   /* VLCVLMController */
     id o_embedded_list;         /* VLCEmbeddedList*/
     id o_coredialogs;           /* VLCCoreDialogProvider */
     VLCInformation * o_info;                  /* VLCInformation */
@@ -119,7 +118,6 @@ struct intf_sys_t
     BOOL nib_prefs_loaded;      /* preferences nibfile */
     BOOL nib_update_loaded;     /* update nibfile */
     BOOL nib_info_loaded;       /* information panel nibfile */
-    BOOL nib_vlm_loaded;        /* VLM Panel nibfile */
     BOOL nib_coredialogs_loaded; /* CoreDialogs nibfile */
 
     IBOutlet VLCControllerWindow * o_window;                     /* main window */
@@ -195,7 +193,6 @@ struct intf_sys_t
     IBOutlet NSMenuItem * o_mi_open_recent;
     IBOutlet NSMenuItem * o_mi_open_recent_cm;
     IBOutlet NSMenuItem * o_mi_open_wizard;
-    IBOutlet NSMenuItem * o_mi_open_vlm;
 
     IBOutlet NSMenu * o_mu_edit;
     IBOutlet NSMenuItem * o_mi_cut;
@@ -390,7 +387,6 @@ struct intf_sys_t
 - (IBAction)intfOpenCapture:(id)sender;
 
 - (IBAction)showWizard:(id)sender;
-- (IBAction)showVLM:(id)sender;
 - (IBAction)showExtended:(id)sender;
 - (IBAction)showBookmarks:(id)sender;
 
index ef0baaa77f508f7764bf1ed62b132315b7bb15dc..62fcebe479a7501714d7a421cc8562fc3ad707fb 100644 (file)
@@ -54,7 +54,6 @@
 #import "AppleRemote.h"
 #import "eyetv.h"
 #import "simple_prefs.h"
-#import "vlm.h"
 
 #import <AddressBook/AddressBook.h>         /* for crashlog send mechanism */
 #import <IOKit/hidsystem/ev_keymap.h>         /* for the media key support */
@@ -324,7 +323,6 @@ static VLCMain *_o_sharedMainInstance = nil;
     o_prefs = nil;
     o_open = [[VLCOpen alloc] init];
     o_wizard = [[VLCWizard alloc] init];
-    o_vlm = [[VLCVLMController alloc] init];
     o_extended = nil;
     o_bookmarks = [[VLCBookmarks alloc] init];
     o_embedded_list = [[VLCEmbeddedList alloc] init];
@@ -1420,11 +1418,6 @@ static unsigned int VLCModifiersToCocoa( unsigned int i_key )
     return nil;
 }
 
-- (id)vlm
-{
-    return o_vlm;
-}
-
 - (id)bookmarks
 {
     if( o_bookmarks )
@@ -2160,14 +2153,6 @@ end:
     }
 }
 
-- (IBAction)showVLM:(id)sender
-{
-    if( !nib_vlm_loaded )
-        nib_vlm_loaded = [NSBundle loadNibNamed:@"VLM" owner: NSApp];
-
-    [o_vlm showVLMWindow];
-}
-
 - (IBAction)showExtended:(id)sender
 {
     if( o_extended == nil )
diff --git a/modules/gui/macosx/vlm.h b/modules/gui/macosx/vlm.h
deleted file mode 100644 (file)
index bbaeba7..0000000
+++ /dev/null
@@ -1,115 +0,0 @@
-/*****************************************************************************
- * vlm.h: VLM Configuration panel for Mac OS X
- *****************************************************************************
- * Copyright (c) 2008 the VideoLAN team
- * $Id$
- *
- * Authors: Felix Paul Kühne <fkuehne@videolan.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., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
- *****************************************************************************/
-
-
-#ifdef HAVE_CONFIG_H
-#   import "config.h"
-#endif
-
-#ifdef ENABLE_VLM
-
-#import <Cocoa/Cocoa.h>
-#import "intf.h"
-
-#import <vlc_vlm.h>
-
-@interface VLCVLMController : NSObject
-{
-    /* broadcast panel */
-    IBOutlet NSButton *o_bcast_add_btn;
-    IBOutlet NSBox *o_bcast_box;
-    IBOutlet NSButton *o_bcast_cancel_btn;
-    IBOutlet NSButton *o_bcast_enable_ckb;
-    IBOutlet NSButton *o_bcast_input_btn;
-    IBOutlet NSTextField *o_bcast_input_fld;
-    IBOutlet NSButton *o_bcast_loop_ckb;
-    IBOutlet NSTextField *o_bcast_name_fld;
-    IBOutlet NSButton *o_bcast_output_btn;
-    IBOutlet NSTextField *o_bcast_output_fld;
-    IBOutlet NSPanel *o_bcast_panel;
-
-    /* schedule panel */
-    IBOutlet id o_sched_add_btn;
-    IBOutlet id o_sched_box;
-    IBOutlet id o_sched_cancel_btn;
-    IBOutlet NSDatePicker *o_sched_date_datePicker;
-    IBOutlet NSTextField *o_sched_date_lbl;
-    IBOutlet NSButton *o_sched_input_btn;
-    IBOutlet NSTextField *o_sched_input_fld;
-    IBOutlet NSTextField *o_sched_input_lbl;
-    IBOutlet NSTextField *o_sched_name_fld;
-    IBOutlet NSTextField *o_sched_name_lbl;
-    IBOutlet NSButton *o_sched_output_btn;
-    IBOutlet NSTextField *o_sched_output_fld;
-    IBOutlet NSTextField *o_sched_output_lbl;
-    IBOutlet NSTextField *o_sched_repeat_fld;
-    IBOutlet NSTextField *o_sched_repeat_lbl;
-    IBOutlet NSDatePicker *o_sched_repeatDelay_datePicker;
-    IBOutlet id o_sched_time_box;
-    IBOutlet NSWindow *o_sched_panel;
-
-    /* VLM Window */
-    IBOutlet NSTableView *o_vlm_list;
-    IBOutlet NSWindow *o_vlm_win;
-
-    /* VOD Panel */
-    IBOutlet NSButton *o_vod_add_btn;
-    IBOutlet id o_vod_box;
-    IBOutlet NSButton *o_vod_cancel_btn;
-    IBOutlet NSButton *o_vod_input_btn;
-    IBOutlet NSTextField *o_vod_input_fld;
-    IBOutlet NSTextField *o_vod_input_lbl;
-    IBOutlet NSButton *o_vod_loop_ckb;
-    IBOutlet NSTextField *o_vod_name_fld;
-    IBOutlet NSTextField *o_vod_name_lbl;
-    IBOutlet NSButton *o_vod_output_btn;
-    IBOutlet NSTextField *o_vod_output_fld;
-    IBOutlet NSTextField *o_vod_output_lbl;
-    IBOutlet NSWindow *o_vod_panel;
-}
-+ (VLCVLMController *)sharedInstance;
-
-/* toolbar */
-- (NSToolbarItem *) toolbar: (NSToolbar *)o_toolbar 
-      itemForItemIdentifier: (NSString *)o_itemIdent 
-  willBeInsertedIntoToolbar: (BOOL)b_willBeInserted;
-- (NSArray *)toolbarDefaultItemIdentifiers: (NSToolbar *)toolbar;
-- (NSArray *)toolbarAllowedItemIdentifiers: (NSToolbar *)toolbar;
-
-- (void)showVLMWindow;
-- (void)initStrings;
-
-- (void)addBcast;
-- (void)addVOD;
-- (void)addSched;
-
-- (IBAction)bcastButtonAction:(id)sender;
-- (IBAction)listDoubleClickAction:(id)sender;
-- (IBAction)schedButtonAction:(id)sender;
-- (IBAction)vodButtonAction:(id)sender;
-
-- (int)numberOfRowsInTableView:(NSTableView *)aTableView;
-- (id)tableView:(NSTableView *)aTableView objectValueForTableColumn:(NSTableColumn *)aTableColumn row:(int)rowIndex;
-@end
-
-#endif
\ No newline at end of file
diff --git a/modules/gui/macosx/vlm.m b/modules/gui/macosx/vlm.m
deleted file mode 100644 (file)
index c66beb0..0000000
+++ /dev/null
@@ -1,184 +0,0 @@
-/*****************************************************************************
- * vlm.m: VLM Configuration panel for Mac OS X
- *****************************************************************************
- * Copyright (c) 2008 the VideoLAN team
- * $Id$
- *
- * Authors: Felix Paul Kühne <fkuehne@videolan.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., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
- *****************************************************************************/
-
-#import "vlm.h"
-
-#ifdef ENABLE_VLM
-
-static NSString * VLCVLMToolbarIdentifier = @"Our VLM Toolbar Identifier";
-static NSString * VLCVODToolbarIdentifier = @"VLM Item";
-static NSString * VLCSchedToolbarIdentifier = @"Sched Item";
-static NSString * VLCBcastToolbarIdentifier = @"Bcast Item";
-
-@implementation VLCVLMController
-
-static VLCVLMController *_o_sharedInstance = nil;
-
-+ (VLCVLMController *)sharedInstance
-{
-    return _o_sharedInstance ? _o_sharedInstance : [[self alloc] init];
-}
-
-- (id)init
-{
-    if( _o_sharedInstance )
-        [self dealloc];
-    else
-    {
-        _o_sharedInstance = [super init];
-    }
-
-    return _o_sharedInstance;
-}
-
-- (void)awakeFromNib
-{
-    [self initStrings];
-    
-    /* setup the toolbar */
-    NSToolbar * o_vlm_toolbar = [[[NSToolbar alloc] initWithIdentifier: VLCVLMToolbarIdentifier] autorelease];
-    [o_vlm_toolbar setAllowsUserCustomization: NO];
-    [o_vlm_toolbar setAutosavesConfiguration: NO];
-    [o_vlm_toolbar setDisplayMode: NSToolbarDisplayModeIconAndLabel];
-    [o_vlm_toolbar setSizeMode: NSToolbarSizeModeRegular];
-    [o_vlm_toolbar setDelegate: self];
-    [o_vlm_win setToolbar: o_vlm_toolbar];
-}
-
-#define CreateToolbarItem( o_name, o_desc, o_img, sel ) \
-    o_toolbarItem = create_toolbar_item(o_itemIdent, o_name, o_desc, o_img, self, @selector(sel));
-static inline NSToolbarItem *
-create_toolbar_item( NSString * o_itemIdent, NSString * o_name, NSString * o_desc, NSString * o_img, id target, SEL selector )
-{
-    NSToolbarItem *o_toolbarItem = [[[NSToolbarItem alloc] initWithItemIdentifier: o_itemIdent] autorelease]; \
-
-    [o_toolbarItem setLabel: o_name];
-    [o_toolbarItem setPaletteLabel: o_desc];
-
-    [o_toolbarItem setToolTip: o_desc];
-    [o_toolbarItem setImage: [NSImage imageNamed: o_img]];
-
-    [o_toolbarItem setTarget: target];
-    [o_toolbarItem setAction: selector];
-
-    [o_toolbarItem setEnabled: YES];
-    [o_toolbarItem setAutovalidates: YES];
-
-    return o_toolbarItem;
-}
-
-- (NSToolbarItem *) toolbar: (NSToolbar *)o_vlm_toolbar 
-      itemForItemIdentifier: (NSString *)o_itemIdent 
-  willBeInsertedIntoToolbar: (BOOL)b_willBeInserted
-{
-    NSToolbarItem *o_toolbarItem = nil;
-
-    if( [o_itemIdent isEqual: VLCVODToolbarIdentifier] )
-    {
-        CreateToolbarItem( _NS("Video On Demand"), _NS("Video On Demand"), @"add_vod", addVOD );
-    }
-    else if( [o_itemIdent isEqual: VLCSchedToolbarIdentifier] )
-    {
-        CreateToolbarItem( _NS("Schedule"), _NS("Schedule"), @"add_schedule", addSched );
-    }
-    else if( [o_itemIdent isEqual: VLCBcastToolbarIdentifier] )
-    {
-        CreateToolbarItem( _NS("Broadcast"), _NS("Broadcast"), @"add_broadcast", addBcast );
-    }
-
-    return o_toolbarItem;
-}
-
-- (NSArray *)toolbarDefaultItemIdentifiers: (NSToolbar *)toolbar
-{
-    return [NSArray arrayWithObjects: VLCBcastToolbarIdentifier, VLCSchedToolbarIdentifier, VLCVODToolbarIdentifier, NSToolbarFlexibleSpaceItemIdentifier, nil];
-}
-
-- (NSArray *)toolbarAllowedItemIdentifiers: (NSToolbar *)toolbar
-{
-    return [NSArray arrayWithObjects: VLCBcastToolbarIdentifier, VLCSchedToolbarIdentifier, VLCVODToolbarIdentifier, NSToolbarFlexibleSpaceItemIdentifier, nil];
-}
-
-- (void)initStrings
-{
-    /* not implemented */
-}
-
-- (void)showVLMWindow
-{
-    [o_vlm_win makeKeyAndOrderFront: self];
-}
-
-- (void)addBcast
-{
-    [NSApp beginSheet: o_bcast_panel modalForWindow: o_vlm_win
-        modalDelegate: self didEndSelector: nil contextInfo: nil];
-}
-
-- (void)addVOD
-{
-    [NSApp beginSheet: o_vod_panel modalForWindow: o_vlm_win
-        modalDelegate: self didEndSelector: nil contextInfo: nil];
-}
-
-- (void)addSched
-{ 
-    [NSApp beginSheet: o_sched_panel modalForWindow: o_vlm_win
-         modalDelegate: self didEndSelector: nil contextInfo: nil];
-}
-
-- (IBAction)bcastButtonAction:(id)sender
-{
-    [NSApp endSheet: o_bcast_panel];
-    [o_bcast_panel close];
-}
-
-- (IBAction)listDoubleClickAction:(id)sender
-{
-}
-
-- (IBAction)schedButtonAction:(id)sender
-{
-    [NSApp endSheet: o_sched_panel];
-    [o_sched_panel close];
-}
-
-- (IBAction)vodButtonAction:(id)sender
-{
-    [NSApp endSheet: o_vod_panel];
-    [o_vod_panel close];
-}
-
-- (int)numberOfRowsInTableView:(NSTableView *)aTableView
-{
-    return 0;
-}
-
-- (id)tableView:(NSTableView *)aTableView objectValueForTableColumn:(NSTableColumn *)aTableColumn row:(int)rowIndex
-{
-    return @"dummy";
-}
-
-@end
-
-#endif
\ No newline at end of file