Changeset ff373bfcd5372ce83927be8129b1980269048ecb

Timestamp:

07/06/03 18:13:11 (5 years ago)

Author:

Gildas Bazin <gbazin@videolan.org>

git-committer:

Gildas Bazin <gbazin@videolan.org> 1057507991 +0000

git-parent:

[e25dd0975da804714a182dfe2dfb66d2f79336ce]

git-author:

Gildas Bazin <gbazin@videolan.org> 1057507991 +0000

Message:

* modules/gui/wxwindows/streamout.cpp: clean-up for sap support.

Added a couple of transcoding codecs (WMV2, MJPG, mp3).
The output filename is now surrounded by quotes and the MRL is updated correctly on codec change.

* install-win32: start menu shortucts are installed in the "All Users" section.
* configure.ac: added a --with-ffmpeg-mp3lame option for when ffmpeg was compiled with mp3lame support.

Files:

• configure.ac (modified) (2 diffs)
• install-win32 (modified) (2 diffs)
• modules/gui/wxwindows/streamout.cpp (modified) (12 diffs)
• modules/gui/wxwindows/wxwindows.h (modified) (4 diffs)

configure.ac

@@ -1 +1 @@
-dnl Autoconf settings for vlc
-3 2003/07/03 19:25:51 garf
+4 2003/07/06 16:13:10 gbazin
-
-AC_INIT(vlc,0.6.0)
@@ -1501 +1501 @@
-if test "${enable_ffmpeg}" != "no"
-then
+  AC_ARG_WITH(ffmpeg-mp3lame,
+    [    --with-ffmpeg-mp3lame   if ffmpeg has been compiled with mp3lame support],
+    [ AX_ADD_LDFLAGS([stream_out_transcode],[-lmp3lame])
+      AX_ADD_LDFLAGS([ffmpeg],[-lmp3lame]) ])
+
-  AC_ARG_WITH(ffmpeg-tree,
-    [    --with-ffmpeg-tree=PATH ffmpeg tree for static linking])

install-win32

@@ -6 +6 @@
-; CHANGELOG ;
-;;;;;;;;;;;;;
-
-
+
+
+
+
-; modifications by Gildas Bazin <gbazin@netcourrier.com> 26 Feb 2003
-; . added the locale directory.
@@ -34 +36 @@
-CRCCheck on
-
+SetShellVarContext all
-InstallDir "$PROGRAMFILES\VideoLAN\VLC"
-

modules/gui/wxwindows/streamout.cpp

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 2000-2001 VideoLAN
-19 2003/07/04 15:20:49 ad
+20 2003/07/06 16:13:11 gbazi
- *
- * Authors: Gildas Bazin <gbazin@netcourrier.com>
@@ -82 +82 @@
-enum
-{
-ANNOUNCE
+MISC
-};
-
@@ -111 +111 @@
-    AudioTranscEnable_Event, AudioTranscCodec_Event, AudioTranscBitrate_Event,
-
-Type
+Misc
-};
-
@@ -151 +151 @@
-    EVT_CHECKBOX(AudioTranscEnable_Event, SoutDialog::OnTranscodingEnable)
-    EVT_COMBOBOX(VideoTranscCodec_Event, SoutDialog::OnTranscodingChange)
+    EVT_TEXT(VideoTranscCodec_Event, SoutDialog::OnTranscodingChange)
-    EVT_COMBOBOX(AudioTranscCodec_Event, SoutDialog::OnTranscodingChange)
+    EVT_TEXT(AudioTranscCodec_Event, SoutDialog::OnTranscodingChange)
-    EVT_COMBOBOX(VideoTranscBitrate_Event, SoutDialog::OnTranscodingChange)
+    EVT_TEXT(VideoTranscBitrate_Event, SoutDialog::OnTranscodingChange)
-    EVT_COMBOBOX(AudioTranscBitrate_Event, SoutDialog::OnTranscodingChange)
+    EVT_TEXT(AudioTranscBitrate_Event, SoutDialog::OnTranscodingChange)
-
-    /* Events generated by the misc panel */
-Type_Event, SoutDialog::OnSAPType
+Misc_Event, SoutDialog::OnSAPMisc
-    EVT_TEXT(SAPAddr_Event, SoutDialog::OnSAPAddrChange)
-
@@ -299 +303 @@
-        if( !dup_opts.IsEmpty() ) dup_opts += wxT(",");
-        dup_opts += wxT("dst=std{access=file,mux=");
-
-
+\"
+\"
-    }
-    if( access_checkboxes[HTTP_ACCESS_OUT]->IsChecked() )
@@ -320 +324 @@
-        dup_opts += wxString::Format( wxT(":%d"),
-                                      net_ports[UDP_ACCESS_OUT]->GetValue() );
-
-if( access_checkboxes[UDP_ACCESS_OUT]->IsChecked() && misc_checkboxes[SAP_ANNOUNCE]->IsChecked() ) /* SAP only if UDP �
-{
-dup_opts += wxT(",sap=");
-dup_opts += misc_addrs[SAP_ANNOUNCE]-> GetLineText(0
-}
-if( access_checkboxes[UDP_ACCESS_OUT]->IsChecked() )
-
- /* the bracket must be closed after SAP ! */
+
+    /* SAP only if UDP 
+    if( sap_checkbox->IsChecked() )
+{
+    dup_opts += wxT(",sap="
+        dup_opts += sap_addr->GetLineText(0);
+    }
+
+
-    }
-    if( access_checkboxes[RTP_ACCESS_OUT]->IsChecked() )
@@ -468 +472 @@
-    // wxFlexGridSizer *sizer = new wxFlexGridSizer( 2, 4, 20 );
-    wxStaticBox *panel_box = new wxStaticBox( panel, -1,
-           
+
-    wxStaticBoxSizer *panel_sizer = new wxStaticBoxSizer( panel_box,
-                                                          wxVERTICAL );
-
-
-
-
-
-
-
-
-
-
-
-
+
-    wxStaticText *label;
-    wxFlexGridSizer *subpanel_sizer;
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-                         wxALIGN_RIGHT | wxALIGN_CENTER_VERTICAL );
-
+
+
-                         wxALIGN_LEFT | wxALIGN_CENTER_VERTICAL );
-
-
-
-
-
-
+
+
+
+
-                      wxALIGN_LEFT | wxALIGN_CENTER_VERTICAL | wxALL, 5 );
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-} 
-
@@ -577 +572 @@
-        wxT("I263"),
-        wxT("WMV1"),
+        wxT("WMV2"),
+        wxT("MJPG")
-    };
-    static const wxString vbitrates_array[] =
@@ -617 +614 @@
-    {
-        wxT("mpga"),
+        wxT("mp3"),
-        wxT("a52")
-    };
@@ -702 +700 @@
-    {
-    case UDP_ACCESS_OUT:
-
-
-
+
+
-    case RTP_ACCESS_OUT:
-        for( i = 1; i < ENCAPS_NUM; i++ )
@@ -721 +718 @@
-
-/*****************************************************************************
-
-
-
-
-
-
-
+
+
+
+
+
-    UpdateMRL();
-}
@@ -738 +733 @@
-    UpdateMRL();
-}
-
-
-/*****************************************************************************

modules/gui/wxwindows/wxwindows.h

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 1999, 2000 VideoLAN
-7 2003/07/04 12:20:32 ad
+8 2003/07/06 16:13:11 gbazi
- *
- * Authors: Gildas Bazin <gbazin@netcourrier.com>
@@ -316 +316 @@
-    void OnMRLChange( wxCommandEvent& event );
-    void OnAccessTypeChange( wxCommandEvent& event );
-    void OnSAPTypeChange( wxCommandEvent& event );
-
-    /* Event handlers for the file access output */
@@ -335 +334 @@
-    void OnTranscodingChange( wxCommandEvent& event );
-
+    /* Event handlers for the misc panel */
+    void OnSAPMiscChange( wxCommandEvent& event );
+
-    DECLARE_EVENT_TABLE();
-
@@ -353 +355 @@
-
-    /* Controls for the SAP announces */
-
-
-
-
-
-
+
+
+
-                            
-    /* Controls for the encapsulation */