Commit 496c6c03 authored by hartman's avatar hartman
Browse files

ALL: New output dialog that uses the new --sout syntax.

  - it is not so powerful as --sout (does not allow for multiple unicasts ie)
  - there is a bug in the transcode settings. not sure what is causing it.
parent 558f4d33
......@@ -181,12 +181,6 @@
openVTSBrowse = id;
panelCancel = id;
panelOk = id;
soutChanged = id;
soutCloseSheet = id;
soutFileBrowse = id;
soutModeChanged = id;
soutSettings = id;
soutStepperChanged = id;
subCloseSheet = id;
subDelayStepperChanged = id;
subFileBrowse = id;
......@@ -244,27 +238,60 @@
"o_net_udpm_port_stp" = id;
"o_panel" = id;
"o_playlist" = id;
"o_sout_access" = id;
"o_sout_access_lbl" = id;
"o_sout_btn_ok" = id;
"o_sout_cbox" = id;
"o_sout_file_btn_browse" = id;
"o_sout_file_path" = id;
"o_sout_mrl" = id;
"o_sout_mrl_lbl" = id;
"o_sout_mux" = id;
"o_sout_mux_lbl" = id;
"o_sout_settings" = id;
"o_sout_sheet" = id;
"o_sout_udp_addr" = id;
"o_sout_udp_addr_lbl" = id;
"o_sout_udp_port" = id;
"o_sout_udp_port_lbl" = id;
"o_sout_udp_port_stp" = id;
"o_tabview" = id;
};
SUPERCLASS = NSObject;
},
{
ACTIONS = {
outputChanged = id;
outputCloseSheet = id;
outputFileBrowse = id;
outputInfoChanged = id;
outputMethodChanged = id;
outputSettings = id;
streamPortStepperChanged = id;
streamTTLStepperChanged = id;
transcodeChanged = id;
transcodeInfoChanged = id;
};
CLASS = VLCOutput;
LANGUAGE = ObjC;
OUTLETS = {
"o_btn_browse" = id;
"o_btn_ok" = id;
"o_display" = id;
"o_file_field" = id;
"o_method" = id;
"o_mux_lbl" = id;
"o_mux_selector" = id;
"o_open_panel" = id;
"o_options_lbl" = id;
"o_output_ckbox" = id;
"o_output_settings" = id;
"o_output_sheet" = id;
"o_stream_address" = id;
"o_stream_address_lbl" = id;
"o_stream_port" = id;
"o_stream_port_lbl" = id;
"o_stream_port_stp" = id;
"o_stream_ttl" = id;
"o_stream_ttl_lbl" = id;
"o_stream_ttl_stp" = id;
"o_stream_type" = id;
"o_stream_type_lbl" = id;
"o_transcode_audio_bitrate" = id;
"o_transcode_audio_bitrate_lbl" = id;
"o_transcode_audio_chkbox" = id;
"o_transcode_audio_selector" = id;
"o_transcode_lbl" = id;
"o_transcode_video_bitrate" = id;
"o_transcode_video_bitrate_lbl" = id;
"o_transcode_video_chkbox" = id;
"o_transcode_video_selector" = id;
};
SUPERCLASS = NSObject;
},
{
ACTIONS = {deleteItems = id; playItem = id; selectAll = id; };
CLASS = VLCPlaylist;
......
......@@ -3,7 +3,7 @@
<plist version="1.0">
<dict>
<key>IBDocumentLocation</key>
<string>38 65 365 441 0 0 1280 1002 </string>
<string>36 88 365 441 0 0 1280 1002 </string>
<key>IBEditorPositions</key>
<dict>
<key>29</key>
......@@ -23,10 +23,10 @@
</array>
<key>IBOpenObjects</key>
<array>
<integer>1345</integer>
<integer>1411</integer>
<integer>29</integer>
</array>
<key>IBSystem Version</key>
<string>6I32</string>
<string>6L29</string>
</dict>
</plist>
......@@ -548,6 +548,8 @@
8ED6C28403E2EB1C0059A3A7,
8ED6C28503E2EB1C0059A3A7,
8ED6C28603E2EB1C0059A3A7,
8E55FB7F0459B0FD00FB3317,
8E55FB800459B0FD00FB3317,
8ED6C28703E2EB1C0059A3A7,
8ED6C28803E2EB1C0059A3A7,
);
......@@ -622,6 +624,20 @@
//8E2
//8E3
//8E4
8E55FB7F0459B0FD00FB3317 = {
fileEncoding = 30;
isa = PBXFileReference;
name = output.h;
path = /Volumes/Users/pjotr/Development/vlc/modules/gui/macosx/output.h;
refType = 0;
};
8E55FB800459B0FD00FB3317 = {
fileEncoding = 30;
isa = PBXFileReference;
name = output.m;
path = /Volumes/Users/pjotr/Development/vlc/modules/gui/macosx/output.m;
refType = 0;
};
8E6BC6F6041643860059A3A7 = {
fileEncoding = 4;
isa = PBXFileReference;
......
......@@ -18,6 +18,8 @@ SOURCES_macosx = \
modules/gui/macosx/playlist.h \
modules/gui/macosx/prefs.m \
modules/gui/macosx/prefs.h \
modules/gui/macosx/output.h \
modules/gui/macosx/output.m \
modules/gui/macosx/vout.m \
modules/gui/macosx/vout.h \
$(NULL)
......
......@@ -2,7 +2,7 @@
* open.h: MacOS X plugin for vlc
*****************************************************************************
* Copyright (C) 2002-2003 VideoLAN
* $Id: open.h,v 1.13 2003/03/26 03:13:30 hartman Exp $
* $Id: open.h,v 1.14 2003/04/30 23:58:56 hartman Exp $
*
* Authors: Jon Lech Johansen <jon-vl@nanocrew.net>
* Christophe Massiot <massiot@via.ecp.fr>
......@@ -71,24 +71,6 @@ NSArray *GetEjectableMediaOfClass( const char *psz_class );
IBOutlet id o_net_http_url;
IBOutlet id o_net_http_url_lbl;
IBOutlet id o_sout_cbox;
IBOutlet id o_sout_settings;
IBOutlet id o_sout_sheet;
IBOutlet id o_sout_mrl_lbl;
IBOutlet id o_sout_mrl;
IBOutlet id o_sout_access;
IBOutlet id o_sout_access_lbl;
IBOutlet id o_sout_file_path;
IBOutlet id o_sout_file_btn_browse;
IBOutlet id o_sout_udp_addr;
IBOutlet id o_sout_udp_addr_lbl;
IBOutlet id o_sout_udp_port;
IBOutlet id o_sout_udp_port_lbl;
IBOutlet id o_sout_udp_port_stp;
IBOutlet id o_sout_mux;
IBOutlet id o_sout_mux_lbl;
IBOutlet id o_sout_btn_ok;
IBOutlet id o_file_sub_ckbox;
IBOutlet id o_file_sub_btn_settings;
IBOutlet id o_file_sub_sheet;
......@@ -125,14 +107,6 @@ NSArray *GetEjectableMediaOfClass( const char *psz_class );
- (IBAction)openNetStepperChanged:(id)sender;
- (void)openNetInfoChanged:(NSNotification *)o_notification;
- (IBAction)soutChanged:(id)sender;
- (IBAction)soutSettings:(id)sender;
- (IBAction)soutFileBrowse:(id)sender;
- (void)soutModeChanged:(NSNotification *)o_notification;
- (void)soutInfoChanged:(NSNotification *)o_notification;
- (IBAction)soutStepperChanged:(id)sender;
- (IBAction)soutCloseSheet:(id)sender;
- (IBAction)subsChanged:(id)sender;
- (IBAction)subSettings:(id)sender;
- (IBAction)subFileBrowse:(id)sender;
......
......@@ -2,7 +2,7 @@
* open.m: MacOS X plugin for vlc
*****************************************************************************
* Copyright (C) 2002-2003 VideoLAN
* $Id: open.m,v 1.29 2003/04/15 14:05:13 hartman Exp $
* $Id: open.m,v 1.30 2003/04/30 23:58:56 hartman Exp $
*
* Authors: Jon Lech Johansen <jon-vl@nanocrew.net>
* Christophe Massiot <massiot@via.ecp.fr>
......@@ -132,17 +132,6 @@ NSArray *GetEjectableMediaOfClass( const char *psz_class )
- (void)awakeFromNib
{
intf_thread_t * p_intf = [NSApp getIntf];
char * psz_sout = config_GetPsz( p_intf, "sout" );
if ( psz_sout != NULL && *psz_sout )
{
[o_sout_cbox setState: YES];
}
else
{
[o_sout_cbox setState: NO];
}
free(psz_sout);
[o_panel setTitle: _NS("Open Source")];
[o_mrl_lbl setTitle: _NS("Media Resource Locator (MRL)")];
......@@ -180,27 +169,6 @@ NSArray *GetEjectableMediaOfClass( const char *psz_class )
[o_net_udp_port setIntValue: config_GetInt( p_intf, "server-port" )];
[o_net_udp_port_stp setIntValue: config_GetInt( p_intf, "server-port" )];
[o_sout_cbox setTitle: _NS("Stream output:")];
[o_sout_btn_ok setTitle: _NS("OK")];
[o_sout_settings setTitle: _NS("Settings...")];
[o_sout_mrl_lbl setTitle: _NS("Stream output MRL")];
[o_sout_access_lbl setTitle: _NS("Output Method")];
[[o_sout_access cellAtRow:0 column:0] setTitle: _NS("File")];
[[o_sout_access cellAtRow:1 column:0] setTitle: _NS("HTTP")];
[[o_sout_access cellAtRow:2 column:0] setTitle: _NS("UDP")];
[[o_sout_access cellAtRow:3 column:0] setTitle: _NS("RTP")];
[o_sout_file_btn_browse setTitle: _NS("Browse...")];
[o_sout_udp_addr_lbl setStringValue: _NS("Address")];
[o_sout_udp_port_lbl setStringValue: _NS("Port")];
[o_sout_mux_lbl setTitle: _NS("Encapsulation Method")];
[[o_sout_mux cellAtRow:0 column:0] setTitle: _NS("MPEG TS")];
[[o_sout_mux cellAtRow:0 column:1] setTitle: _NS("MPEG PS")];
[[o_sout_mux cellAtRow:0 column:2] setTitle: _NS("AVI")];
[[o_sout_mux cellAtRow:0 column:3] setTitle: _NS("Ogg")];
[o_file_sub_ckbox setTitle: _NS("Load subtitles file:")];
[o_file_sub_btn_settings setTitle: _NS("Settings...")];
[o_file_sub_btn_browse setTitle: _NS("Browse...")];
......@@ -249,19 +217,6 @@ NSArray *GetEjectableMediaOfClass( const char *psz_class )
selector: @selector(openNetInfoChanged:)
name: NSControlTextDidChangeNotification
object: o_net_http_url];
[[NSNotificationCenter defaultCenter] addObserver: self
selector: @selector(soutInfoChanged:)
name: NSControlTextDidChangeNotification
object: o_sout_file_path];
[[NSNotificationCenter defaultCenter] addObserver: self
selector: @selector(soutInfoChanged:)
name: NSControlTextDidChangeNotification
object: o_sout_udp_addr];
[[NSNotificationCenter defaultCenter] addObserver: self
selector: @selector(soutInfoChanged:)
name: NSControlTextDidChangeNotification
object: o_sout_udp_port];
}
- (void)openTarget:(int)i_type
......@@ -276,17 +231,7 @@ NSArray *GetEjectableMediaOfClass( const char *psz_class )
if( i_result )
{
NSString *o_sout = [o_sout_mrl stringValue];
intf_thread_t * p_intf = [NSApp getIntf];
if ( [o_sout_cbox state] )
{
config_PutPsz( p_intf, "sout", [o_sout lossyCString] );
}
else
{
config_PutPsz( p_intf, "sout", "" );
}
NSString *o_source = [o_mrl stringValue];
BOOL b_enq = [o_ckbox_enqueue state] == NSOnState ? YES : NO;
......@@ -311,7 +256,6 @@ NSArray *GetEjectableMediaOfClass( const char *psz_class )
config_PutFloat( p_intf, "sub-fps", 0.0 );
}
}
[self soutModeChanged: nil];
}
- (void)tabView:(NSTabView *)o_tv didSelectTabViewItem:(NSTabViewItem *)o_tvi
......@@ -663,140 +607,6 @@ NSArray *GetEjectableMediaOfClass( const char *psz_class )
[o_mrl setStringValue: o_mrl_string];
}
- (IBAction)soutChanged:(id)sender;
{
if ([o_sout_cbox state] == NSOnState)
{
[o_sout_settings setEnabled:YES];
}
else
{
[o_sout_settings setEnabled:NO];
}
}
- (IBAction)soutSettings:(id)sender
{
[self soutModeChanged: nil];
[NSApp beginSheet: o_sout_sheet
modalForWindow: [sender window]
modalDelegate: self
didEndSelector: NULL
contextInfo: nil];
}
- (IBAction)soutFileBrowse:(id)sender
{
NSSavePanel *o_save_panel = [NSSavePanel savePanel];
NSString *o_mux_string;
if ( [[[o_sout_mux selectedCell] title] isEqualToString: _NS("MPEG PS")] )
o_mux_string = @"vob";
else if ( [[[o_sout_mux selectedCell] title] isEqualToString: _NS("AVI")] )
o_mux_string = @"avi";
else if ( [[[o_sout_mux selectedCell] title] isEqualToString: _NS("Ogg")] )
o_mux_string = @"ogm";
else
o_mux_string = @"ts";
NSString * o_name = [NSString stringWithFormat: @"vlc-output.%@",
o_mux_string];
[o_save_panel setTitle: _NS("Save File")];
[o_save_panel setPrompt: _NS("Save")];
if( [o_save_panel runModalForDirectory: nil
file: o_name] == NSOKButton )
{
NSString *o_filename = [o_save_panel filename];
[o_sout_file_path setStringValue: o_filename];
[self soutInfoChanged: nil];
}
}
- (void)soutModeChanged:(NSNotification *)o_notification
{
NSString *o_mode;
BOOL b_file = FALSE;
BOOL b_net = FALSE;
o_mode = [[o_sout_access selectedCell] title];
if( [o_mode isEqualToString: _NS("File")] ) b_file = TRUE;
else if( [o_mode isEqualToString: _NS("UDP")] ) b_net = TRUE;
else if( [o_mode isEqualToString: _NS("RTP")] ) b_net = TRUE;
[o_sout_file_path setEnabled: b_file];
[o_sout_file_btn_browse setEnabled: b_file];
[o_sout_udp_addr setEnabled: !b_file];
[o_sout_udp_port setEnabled: !b_file];
[o_sout_udp_port_stp setEnabled: !b_file ];
[[o_sout_mux cellAtRow:0 column: 1] setEnabled: !b_net];
[[o_sout_mux cellAtRow:0 column: 2] setEnabled: !b_net];
[[o_sout_mux cellAtRow:0 column: 3] setEnabled: !b_net];
if ( b_net )
{
[o_sout_mux selectCellAtRow:0 column: 0];
}
[self soutInfoChanged: nil];
}
- (void)soutInfoChanged:(NSNotification *)o_notification
{
NSString *o_mode;
NSString *o_mux;
NSString *o_mrl_string;
NSString *o_mux_string;
o_mode = [[o_sout_access selectedCell] title];
o_mux = [[o_sout_mux selectedCell] title];
if ( [o_mux isEqualToString: _NS("AVI")] ) o_mux_string = @"avi";
else if ( [o_mux isEqualToString: _NS("Ogg")] ) o_mux_string = @"ogg";
else if ( [o_mux isEqualToString: _NS("MPEG PS")] ) o_mux_string = @"ps";
else o_mux_string = @"ts";
if ( [o_mode isEqualToString: _NS("File")] )
{
o_mrl_string = [NSString stringWithFormat: @"file/%@://%@",
o_mux_string, [o_sout_file_path stringValue]];
}
else if ( [o_mode isEqualToString: _NS("HTTP")] )
{
o_mrl_string = [NSString stringWithFormat: @"http/%@://%@:%i",
o_mux_string, [o_sout_udp_addr stringValue],
[o_sout_udp_port intValue]];
}
else if ( [o_mode isEqualToString: _NS("UDP")] )
{
o_mrl_string = [NSString stringWithFormat: @"udp/%@://%@:%i",
o_mux_string, [o_sout_udp_addr stringValue],
[o_sout_udp_port intValue]];
}
else
{
o_mrl_string = [NSString stringWithFormat: @"rtp/%@://%@:%i",
o_mux_string, [o_sout_udp_addr stringValue],
[o_sout_udp_port intValue]];
}
[o_sout_mrl setStringValue: o_mrl_string];
}
- (IBAction)soutStepperChanged:(id)sender
{
[o_sout_udp_port setIntValue: [o_sout_udp_port_stp intValue]];
[self soutInfoChanged: nil];
}
- (IBAction)soutCloseSheet:(id)sender
{
[o_sout_sheet orderOut:sender];
[NSApp endSheet: o_sout_sheet];
}
- (IBAction)openFile:(id)sender
{
NSOpenPanel *o_open_panel = [NSOpenPanel openPanel];
......
/*****************************************************************************
* output.h: MacOS X Output Dialog
*****************************************************************************
* Copyright (C) 2002-2003 VideoLAN
* $Id: output.h,v 1.1 2003/04/30 23:58:56 hartman Exp $
*
* Authors: Jon Lech Johansen <jon-vl@nanocrew.net>
* Christophe Massiot <massiot@via.ecp.fr>
* Derk-Jan Hartman <thedj@users.sourceforge.net>
*
* 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.
*****************************************************************************/
/*****************************************************************************
* VLCOutput interface
*****************************************************************************/
@interface VLCOutput : NSObject
{
IBOutlet id o_open_panel;
IBOutlet id o_output_ckbox;
IBOutlet id o_output_settings;
IBOutlet id o_output_sheet;
IBOutlet id o_btn_ok;
IBOutlet id o_options_lbl;
IBOutlet id o_display;
IBOutlet id o_method;
IBOutlet id o_file_field;
IBOutlet id o_btn_browse;
IBOutlet id o_stream_address;
IBOutlet id o_stream_address_lbl;
IBOutlet id o_stream_port;
IBOutlet id o_stream_port_stp;
IBOutlet id o_stream_port_lbl;
IBOutlet id o_stream_ttl;
IBOutlet id o_stream_ttl_stp;
IBOutlet id o_stream_ttl_lbl;
IBOutlet id o_stream_type;
IBOutlet id o_stream_type_lbl;
IBOutlet id o_mux_lbl;
IBOutlet id o_mux_selector;
IBOutlet id o_transcode_audio_bitrate;
IBOutlet id o_transcode_audio_bitrate_lbl;
IBOutlet id o_transcode_audio_chkbox;
IBOutlet id o_transcode_audio_selector;
IBOutlet id o_transcode_lbl;
IBOutlet id o_transcode_video_bitrate;
IBOutlet id o_transcode_video_bitrate_lbl;
IBOutlet id o_transcode_video_chkbox;
IBOutlet id o_transcode_video_selector;
NSString *o_mrl;
NSString *o_transcode;
}
- (void)setMRL:(NSString *)o_mrl_string;
- (void)setTranscode:(NSString *)o_transcode_string;
- (void)initStrings;
- (IBAction)outputChanged:(id)sender;
- (IBAction)outputSettings:(id)sender;
- (IBAction)outputCloseSheet:(id)sender;
- (void)outputMethodChanged:(NSNotification *)o_notification;
- (void)outputInfoChanged:(NSNotification *)o_notification;
- (void)TTLChanged:(NSNotification *)o_notification;
- (IBAction)outputFileBrowse:(id)sender;
- (void)transcodeChanged:(NSNotification *)o_notification;
- (void)transcodeInfoChanged:(NSNotification *)o_notification;
@end
/*****************************************************************************
* output.m: MacOS X Output Dialog
*****************************************************************************
* Copyright (C) 2002-2003 VideoLAN
* $Id: output.m,v 1.1 2003/04/30 23:58:56 hartman Exp $
*
* Authors: Jon Lech Johansen <jon-vl@nanocrew.net>
* Christophe Massiot <massiot@via.ecp.fr>
* Derk-Jan Hartman <thedj@users.sourceforge.net>
*
* 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.
*****************************************************************************/
/*****************************************************************************
* Preamble
*****************************************************************************/
#include <stdlib.h> /* malloc(), free() */
#include <string.h>
#include "intf.h"
#include "output.h"
/*****************************************************************************
* VLCOutput implementation
*****************************************************************************/
@implementation VLCOutput
- (id)init
{
self = [super init];
o_mrl = [[NSString alloc] init];
o_transcode = [[NSString alloc] init];
return self;
}
- (void)dealloc
{
[o_mrl release];
[o_transcode release];
[super dealloc];
}
- (void)setMRL:(NSString *)o_mrl_string
{
[o_mrl autorelease];
o_mrl = [o_mrl_string copy];
}
- (void)setTranscode:(NSString *)o_transcode_string
{
[o_transcode autorelease];
o_transcode = [o_transcode_string copy];
}
- (void)awakeFromNib
{
intf_thread_t * p_intf = [NSApp getIntf];
char * psz_sout = config_GetPsz( p_intf, "sout" );
if ( psz_sout != NULL && *psz_sout )
{
[o_output_ckbox setState: YES];
}
else
{