Commit 2b8c207c authored by Felix Paul Kühne's avatar Felix Paul Kühne

macosx: remove streaming & transcoding wizard in favor of the modern Convert & Save/Stream dialog

parent 8861bc52
......@@ -429,8 +429,6 @@
1CCB5F921A62A724004C3E90 /* VLCUIWidgets.m in Sources */ = {isa = PBXBuildFile; fileRef = 5CCED71514C0D4A90057F8D1 /* VLCUIWidgets.m */; };
1CCB5F931A62A724004C3E90 /* VLCVoutWindowController.h in Sources */ = {isa = PBXBuildFile; fileRef = E0C2583E161B593D00185AAD /* VLCVoutWindowController.h */; };
1CCB5F941A62A724004C3E90 /* VLCVoutWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = E0C2583F161B593D00185AAD /* VLCVoutWindowController.m */; };
1CCB5F951A62A724004C3E90 /* wizard.h in Sources */ = {isa = PBXBuildFile; fileRef = DC769AB8085DF0DB001A838D /* wizard.h */; };
1CCB5F961A62A724004C3E90 /* wizard.m in Sources */ = {isa = PBXBuildFile; fileRef = DC769AB7085DF0DB001A838D /* wizard.m */; };
1CCB5F971A62A724004C3E90 /* Windows.h in Sources */ = {isa = PBXBuildFile; fileRef = E06CF7F416020F6200C698B7 /* Windows.h */; };
1CCB5F981A62A724004C3E90 /* Windows.m in Sources */ = {isa = PBXBuildFile; fileRef = E06CF7F516020F6200C698B7 /* Windows.m */; };
1CCB5F991A62A724004C3E90 /* misc.h in Sources */ = {isa = PBXBuildFile; fileRef = 8ED6C27F03E2EB1C0059A3A7 /* misc.h */; };
......@@ -861,7 +859,6 @@
CCD83E4B13FEA143004F1652 /* Preferences.xib in Resources */ = {isa = PBXBuildFile; fileRef = CCD83E3C13FEA143004F1652 /* Preferences.xib */; };
CCD83E4C13FEA143004F1652 /* SyncTracks.xib in Resources */ = {isa = PBXBuildFile; fileRef = CCD83E3E13FEA143004F1652 /* SyncTracks.xib */; };
CCD83E4D13FEA143004F1652 /* VideoEffects.xib in Resources */ = {isa = PBXBuildFile; fileRef = CCD83E4013FEA143004F1652 /* VideoEffects.xib */; };
CCD83E4E13FEA143004F1652 /* Wizard.xib in Resources */ = {isa = PBXBuildFile; fileRef = CCD83E4213FEA143004F1652 /* Wizard.xib */; };
CCDB535D13E97D3500A1782F /* dropzone-background.png in Resources */ = {isa = PBXBuildFile; fileRef = CCDB535C13E97D3500A1782F /* dropzone-background.png */; };
CCE8BAC4160615D9006741FB /* effects-one-button-pressed.png in Resources */ = {isa = PBXBuildFile; fileRef = CCE8BAC2160615D9006741FB /* effects-one-button-pressed.png */; };
CCE8BAC5160615D9006741FB /* effects-one-button-pressed@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = CCE8BAC3160615D9006741FB /* effects-one-button-pressed@2x.png */; };
......@@ -1749,7 +1746,6 @@
CCD83E3D13FEA143004F1652 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = Resources/English.lproj/Preferences.xib; sourceTree = "<group>"; };
CCD83E3F13FEA143004F1652 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = Resources/English.lproj/SyncTracks.xib; sourceTree = "<group>"; };
CCD83E4113FEA143004F1652 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = Resources/English.lproj/VideoEffects.xib; sourceTree = "<group>"; };
CCD83E4313FEA143004F1652 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = Resources/English.lproj/Wizard.xib; sourceTree = "<group>"; };
CCDB535C13E97D3500A1782F /* dropzone-background.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "dropzone-background.png"; path = "Resources/mainwindow/dropzone-background.png"; sourceTree = "<group>"; };
CCDBA3B313D32E200006127B /* macosx.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = macosx.m; path = ../../../modules/video_output/macosx.m; sourceTree = "<group>"; };
CCDDF1AC172FF4C4007729A1 /* netconf.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = netconf.c; path = ../../../src/darwin/netconf.c; sourceTree = "<group>"; };
......@@ -1761,8 +1757,6 @@
CCF0777B13659A8000AF19FD /* SPMediaKeyTap.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = SPMediaKeyTap.h; path = ../../../modules/gui/macosx/SPMediaKeyTap.h; sourceTree = SOURCE_ROOT; };
CCF0777C13659A8000AF19FD /* SPMediaKeyTap.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = SPMediaKeyTap.m; path = ../../../modules/gui/macosx/SPMediaKeyTap.m; sourceTree = SOURCE_ROOT; };
DC1A176914E2778A001477C6 /* qtsound.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = qtsound.m; path = ../../../modules/access/qtsound.m; sourceTree = "<group>"; };
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; };
DCC8017816FCA036007FE736 /* avcapture.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = avcapture.m; path = ../../../modules/access/avcapture.m; sourceTree = "<group>"; };
DCC8017916FCA0DA007FE736 /* AVFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AVFoundation.framework; path = System/Library/Frameworks/AVFoundation.framework; sourceTree = SDKROOT; };
DCE7BD0608A5724D007B10AE /* bookmarks.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = bookmarks.m; path = ../../../modules/gui/macosx/bookmarks.m; sourceTree = SOURCE_ROOT; };
......@@ -1926,8 +1920,6 @@
5CCED71514C0D4A90057F8D1 /* VLCUIWidgets.m */,
E0C2583E161B593D00185AAD /* VLCVoutWindowController.h */,
E0C2583F161B593D00185AAD /* VLCVoutWindowController.m */,
DC769AB8085DF0DB001A838D /* wizard.h */,
DC769AB7085DF0DB001A838D /* wizard.m */,
CC017A0E14A4C8B600C09A4F /* custom UI code */,
CC0CD0E513DE0FC600B0D90D /* Imported Code */,
);
......@@ -2955,7 +2947,6 @@
CCD83E3C13FEA143004F1652 /* Preferences.xib */,
CCD83E3E13FEA143004F1652 /* SyncTracks.xib */,
CCD83E4013FEA143004F1652 /* VideoEffects.xib */,
CCD83E4213FEA143004F1652 /* Wizard.xib */,
CCD83E2B13FE9B90004F1652 /* MainMenu.xib */,
CC0663371566CD5A003A411C /* ConvertAndSave.xib */,
633121CE1B5112C300E636DA /* ResumeDialog.xib */,
......@@ -3414,7 +3405,6 @@
1C88BA7419DC7B2200645190 /* yosemite-window-minimize-over.png in Resources */,
CCD83E4C13FEA143004F1652 /* SyncTracks.xib in Resources */,
CCD83E4D13FEA143004F1652 /* VideoEffects.xib in Resources */,
CCD83E4E13FEA143004F1652 /* Wizard.xib in Resources */,
1C88BA9519DC7C5D00645190 /* ys-sidebar-music.png in Resources */,
CCB320721423AAEE002CB53B /* shuffle-blue.png in Resources */,
CC0586BA14ACF7C000659A99 /* sidebar-local.png in Resources */,
......@@ -3986,8 +3976,6 @@
1CCB5F921A62A724004C3E90 /* VLCUIWidgets.m in Sources */,
1CCB5F931A62A724004C3E90 /* VLCVoutWindowController.h in Sources */,
1CCB5F941A62A724004C3E90 /* VLCVoutWindowController.m in Sources */,
1CCB5F951A62A724004C3E90 /* wizard.h in Sources */,
1CCB5F961A62A724004C3E90 /* wizard.m in Sources */,
1CCB5F971A62A724004C3E90 /* Windows.h in Sources */,
1CCB5F981A62A724004C3E90 /* Windows.m in Sources */,
1CCB5F991A62A724004C3E90 /* misc.h in Sources */,
......@@ -4192,14 +4180,6 @@
name = VideoEffects.xib;
sourceTree = "<group>";
};
CCD83E4213FEA143004F1652 /* Wizard.xib */ = {
isa = PBXVariantGroup;
children = (
CCD83E4313FEA143004F1652 /* English */,
);
name = Wizard.xib;
sourceTree = "<group>";
};
E0FB95CC1615B6DF0005069A /* DetachedVideoWindow.xib */ = {
isa = PBXVariantGroup;
children = (
......
......@@ -55,7 +55,6 @@
IBOutlet NSMenuItem * o_mi_open_capture;
IBOutlet NSMenuItem * o_mi_open_recent;
IBOutlet NSMenuItem * o_mi_close_window;
IBOutlet NSMenuItem * o_mi_open_wizard;
IBOutlet NSMenuItem * o_mi_convertandsave;
IBOutlet NSMenuItem * o_mi_save_playlist;
IBOutlet NSMenuItem * o_mi_revealInFinder;
......@@ -259,7 +258,6 @@
- (IBAction)telxNavLink:(id)sender;
- (IBAction)togglePostProcessing:(id)sender;
- (IBAction)showWizard:(id)sender;
- (IBAction)showConvertAndSave:(id)sender;
- (IBAction)showVideoEffects:(id)sender;
- (IBAction)showAudioEffects:(id)sender;
......
......@@ -29,7 +29,6 @@
#import <vlc_input.h>
#import "open.h"
#import "wizard.h"
#import "about.h"
#import "AudioEffects.h"
#import "TrackSynchronization.h"
......@@ -386,7 +385,6 @@
[o_mi_open_capture setTitle: _NS("Open Capture Device...")];
[o_mi_open_recent setTitle: _NS("Open Recent")];
[o_mi_close_window setTitle: _NS("Close Window")];
[o_mi_open_wizard setTitle: _NS("Streaming/Exporting Wizard...")];
[o_mi_convertandsave setTitle: _NS("Convert / Stream...")];
[o_mi_save_playlist setTitle: _NS("Save Playlist...")];
[o_mi_revealInFinder setTitle: _NS("Reveal in Finder")];
......@@ -1106,12 +1104,6 @@
[[[VLCMain sharedInstance] open] openCapture];
}
- (IBAction)showWizard:(id)sender
{
[[[VLCMain sharedInstance] wizard] resetWizard];
[[[VLCMain sharedInstance] wizard] showWizard];
}
- (IBAction)savePlaylist:(id)sender
{
[[[VLCMain sharedInstance] playlist] savePlaylist:sender];
......
......@@ -70,5 +70,4 @@ libmacosx_plugin_la_SOURCES = \
VideoView.h VideoView.m \
VLCUIWidgets.h VLCUIWidgets.m \
VLCVoutWindowController.h VLCVoutWindowController.m \
Windows.h Windows.m \
wizard.h wizard.m
Windows.h Windows.m
......@@ -35,7 +35,6 @@
*****************************************************************************/
#import "bookmarks.h"
#import "wizard.h"
#import "CompatibilityFixes.h"
@interface VLCBookmarks() <NSTableViewDataSource, NSTableViewDelegate>
......@@ -271,6 +270,8 @@ clear:
- (IBAction)extract:(id)sender
{
#warning this does not work anymore
#if 0
if ([_dataTable numberOfSelectedRows] < 2) {
NSBeginAlertSheet(_NS("Invalid selection"), _NS("OK"), @"", @"", _bookmarksWindow, nil, nil, nil, nil, @"%@",_NS("Two bookmarks have to be selected."));
return;
......@@ -313,6 +314,7 @@ clear:
for (int i = 0; i < i_bookmarks; i++)
vlc_seekpoint_Delete(pp_bookmarks[i]);
free(pp_bookmarks);
#endif
}
- (IBAction)goToBookmark:(id)sender
......
......@@ -92,7 +92,6 @@ static NSString * VLCInputChangedNotification = @"VLCInputChangedNotification";
- (id)simplePreferences;
- (id)preferences;
- (VLCPlaylist *)playlist;
- (id)wizard;
- (id)coreDialogProvider;
- (ResumeDialogController *)resumeDialog;
- (id)eyeTVController;
......
......@@ -55,7 +55,6 @@
#import "playlistinfo.h"
#import "controls.h"
#import "open.h"
#import "wizard.h"
#import "bookmarks.h"
#import "coredialogs.h"
#import "AppleRemote.h"
......@@ -496,7 +495,6 @@ audio_output_t *getAout(void)
id o_prefs; /* VLCPrefs */
id o_sprefs; /* VLCSimplePrefs */
id o_open; /* VLCOpen */
id o_wizard; /* VLCWizard */
id o_coredialogs; /* VLCCoreDialogProvider */
VLCInfo *o_info; /* VLCInformation */
id o_eyetv; /* VLCEyeTVController */
......@@ -507,7 +505,6 @@ audio_output_t *getAout(void)
BOOL nib_main_loaded; /* main nibfile */
BOOL nib_open_loaded; /* open nibfile */
BOOL nib_about_loaded; /* about nibfile */
BOOL nib_wizard_loaded; /* wizard nibfile */
BOOL nib_prefs_loaded; /* preferences nibfile */
BOOL nib_info_loaded; /* information panel nibfile */
BOOL nib_coredialogs_loaded; /* CoreDialogs nibfile */
......@@ -1316,19 +1313,6 @@ audio_output_t *getAout(void)
return o_playlist;
}
- (id)wizard
{
if (!o_wizard)
o_wizard = [[VLCWizard alloc] init];
if (!nib_wizard_loaded) {
nib_wizard_loaded = [NSBundle loadNibNamed:@"Wizard" owner: NSApp];
[o_wizard initStrings];
}
return o_wizard;
}
- (id)coreDialogProvider
{
if (!nib_coredialogs_loaded) {
......
......@@ -33,14 +33,6 @@
@end
/*****************************************************************************
* VLCPlaylistWizard interface
*****************************************************************************/
@interface VLCPlaylistWizard : NSObject
- (IBAction)reloadOutlineView;
@end
/*****************************************************************************
* VLCPlaylist interface
*****************************************************************************/
......@@ -49,7 +41,6 @@
IBOutlet VLCPlaylistView* o_outline_view;
IBOutlet id o_controller;
IBOutlet id o_playlist_wizard;
IBOutlet id o_btn_playlist;
IBOutlet id o_playlist_view;
......
......@@ -42,7 +42,6 @@
#import "CompatibilityFixes.h"
#import "intf.h"
#import "wizard.h"
#import "bookmarks.h"
#import "playlistinfo.h"
#import "playlist.h"
......@@ -126,23 +125,6 @@
@end
/*****************************************************************************
* VLCPlaylistWizard implementation
*****************************************************************************/
@implementation VLCPlaylistWizard
- (IBAction)reloadOutlineView
{
/* Only reload the outlineview if the wizard window is open since this can
be quite long on big playlists */
#warning dead code
// to be removed
}
@end
/*****************************************************************************
* An extension to NSOutlineView's interface to fix compilation warnings
* and let us access these 2 functions properly.
......
/*****************************************************************************
* wizard.h: MacOS X Streaming Wizard
*****************************************************************************
* Copyright (C) 2005-2007 VLC authors and VideoLAN
* $Id$
*
* Authors: Felix 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.
*****************************************************************************/
/*****************************************************************************
* VLCWizard
*****************************************************************************/
#import <Cocoa/Cocoa.h>
@interface VLCWizard : NSObject
{
/* general items */
IBOutlet id o_btn_backward;
IBOutlet id o_btn_cancel;
IBOutlet id o_btn_forward;
IBOutlet id o_tab_pageHolder;
IBOutlet id o_wizard_window;
IBOutlet id o_playlist_wizard;
/* page one ("Hello") */
IBOutlet id o_t1_btn_mrInfo_strmg;
IBOutlet id o_t1_btn_mrInfo_trnscd;
IBOutlet id o_t1_matrix_strmgOrTrnscd;
IBOutlet id o_t1_txt_notice;
IBOutlet id o_t1_txt_text;
IBOutlet id o_t1_txt_title;
/* page two ("Input") */
IBOutlet id o_t2_box_prtExtrct;
IBOutlet id o_t2_ckb_enblPartExtrct;
IBOutlet id o_t2_btn_chooseFile;
IBOutlet id o_t2_fld_pathToNewStrm;
IBOutlet id o_t2_fld_prtExtrctFrom;
IBOutlet id o_t2_fld_prtExtrctTo;
IBOutlet id o_t2_matrix_inputSourceType;
IBOutlet id o_t2_tbl_plst;
IBOutlet id o_t2_text;
IBOutlet id o_t2_title;
IBOutlet id o_t2_txt_prtExtrctFrom;
IBOutlet id o_t2_txt_prtExtrctTo;
/* page one ("Streaming 1") */
IBOutlet id o_t3_box_dest;
IBOutlet id o_t3_box_strmgMthd;
IBOutlet id o_t3_fld_address;
IBOutlet id o_t3_matrix_stmgMhd;
IBOutlet id o_t3_txt_destInfo;
IBOutlet id o_t3_txt_text;
IBOutlet id o_t3_txt_title;
IBOutlet id o_t3_txt_strgMthdInfo;
/* page four ("Transcode 1") */
IBOutlet id o_t4_box_audio;
IBOutlet id o_t4_box_video;
IBOutlet id o_t4_ckb_audio;
IBOutlet id o_t4_ckb_video;
IBOutlet id o_t4_pop_audioBitrate;
IBOutlet id o_t4_pop_audioCodec;
IBOutlet id o_t4_pop_videoBitrate;
IBOutlet id o_t4_pop_videoCodec;
IBOutlet id o_t4_text;
IBOutlet id o_t4_title;
IBOutlet id o_t4_txt_audioBitrate;
IBOutlet id o_t4_txt_videoBitrate;
IBOutlet id o_t4_txt_audioCodec;
IBOutlet id o_t4_txt_videoCodec;
IBOutlet id o_t4_txt_hintAudio;
IBOutlet id o_t4_txt_hintVideo;
/* page five ("Encap") */
IBOutlet id o_t5_matrix_encap;
IBOutlet id o_t5_text;
IBOutlet id o_t5_title;
/* page six ("Streaming 2") */
IBOutlet id o_t6_ckb_sap;
IBOutlet id o_t6_fld_sap;
IBOutlet id o_t6_fld_ttl;
IBOutlet id o_t6_text;
IBOutlet id o_t6_title;
IBOutlet id o_t6_txt_ttl;
IBOutlet id o_t6_btn_mrInfo_ttl;
IBOutlet id o_t6_btn_mrInfo_sap;
IBOutlet id o_t6_btn_mrInfo_local;
IBOutlet id o_t6_ckb_soverlay;
IBOutlet id o_t6_ckb_local;
/* page seven ("Transcode 2") */
IBOutlet id o_t7_btn_chooseFile;
IBOutlet id o_t7_fld_filePath;
IBOutlet id o_t7_text;
IBOutlet id o_t7_title;
IBOutlet id o_t7_txt_saveFileTo;
IBOutlet id o_t7_btn_mrInfo_local;
IBOutlet id o_t7_ckb_soverlay;
IBOutlet id o_t7_ckb_local;
/* page eight ("Summary") */
IBOutlet id o_t8_fld_destination;
IBOutlet id o_t8_fld_encapFormat;
IBOutlet id o_t8_fld_inptStream;
IBOutlet id o_t8_fld_partExtract;
IBOutlet id o_t8_fld_sap;
IBOutlet id o_t8_fld_saveFileTo;
IBOutlet id o_t8_fld_strmgMthd;
IBOutlet id o_t8_fld_trnscdAudio;
IBOutlet id o_t8_fld_trnscdVideo;
IBOutlet id o_t8_fld_soverlay;
IBOutlet id o_t8_fld_ttl;
IBOutlet id o_t8_fld_mrl;
IBOutlet id o_t8_fld_local;
IBOutlet id o_t8_txt_destination;
IBOutlet id o_t8_txt_encapFormat;
IBOutlet id o_t8_txt_inputStream;
IBOutlet id o_t8_txt_partExtract;
IBOutlet id o_t8_txt_sap;
IBOutlet id o_t8_txt_saveFileTo;
IBOutlet id o_t8_txt_strmgMthd;
IBOutlet id o_t8_txt_text;
IBOutlet id o_t8_txt_title;
IBOutlet id o_t8_txt_trnscdAudio;
IBOutlet id o_t8_txt_trnscdVideo;
IBOutlet id o_t8_txt_soverlay;
IBOutlet id o_t8_txt_ttl;
IBOutlet id o_t8_txt_mrl;
IBOutlet id o_t8_txt_local;
}
+ (VLCWizard *)sharedInstance;
- (void)showWizard;
- (void)resetWizard;
- (id)playlistWizard;
- (void)initWithExtractValuesFrom:(NSString *)from
to:(NSString *)to
ofItem:(NSString *)item;
- (IBAction)cancelRun:(id)sender;
- (IBAction)nextTab:(id)sender;
- (IBAction)prevTab:(id)sender;
- (IBAction)t1_mrInfo_streaming:(id)sender;
- (IBAction)t1_mrInfo_transcode:(id)sender;
- (IBAction)t2_addNewStream:(id)sender;
- (IBAction)t2_chooseStreamOrPlst:(id)sender;
- (IBAction)t2_enableExtract:(id)sender;
- (IBAction)t3_strmMthdChanged:(id)sender;
- (IBAction)t4_AudCdcChanged:(id)sender;
- (IBAction)t4_enblAudTrnscd:(id)sender;
- (IBAction)t4_enblVidTrnscd:(id)sender;
- (IBAction)t4_VidCdcChanged:(id)sender;
- (IBAction)t6_enblSapAnnce:(id)sender;
- (IBAction)t6_mrInfo_ttl:(id)sender;
- (IBAction)t6_mrInfo_sap:(id)sender;
- (IBAction)t67_mrInfo_local:(id)sender;
- (IBAction)t7_selectTrnscdDestFile:(id)sender;
@end
This diff is collapsed.
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