Changeset 48190fd306402746f081f290f0223642b1dfeecf

Timestamp:

05/11/03 18:57:29 (5 years ago)

Author:

Gildas Bazin <gbazin@videolan.org>

git-committer:

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

git-parent:

[64336427c00672d4c2d15dbb6691e6d57a00e4e7]

git-author:

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

Message:

* src/input/input.c: honor the --demux config option (will be overriden if demux is specified in the MRL).

I'm not exactly sure this is wise as some users will surely fuck-up their preferences and force a specific demux...
but this also allows me to specifiy the demuxdump demux with an input option (very handy to include the demuxdump option in the streamout gui dialogs).

* src/misc/modules.c: changed module_Need() to use var_Get() instead of config_Get.

* modules/gui/wxwindows/*: moved the demuxdump option from the open dialog to the streamout dialog.

Files:

• modules/demux/demuxdump.c (modified) (3 diffs)
• modules/gui/wxwindows/open.cpp (modified) (12 diffs)
• modules/gui/wxwindows/streamout.cpp (modified) (9 diffs)
• modules/gui/wxwindows/wxwindows.h (modified) (7 diffs)
• src/input/input.c (modified) (3 diffs)
• src/misc/configuration.c (modified) (2 diffs)
• src/misc/modules.c (modified) (2 diffs)
• src/misc/variables.c (modified) (2 diffs)

modules/demux/demuxdump.c

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 2001 VideoLAN
-0 2003/09/07 22:48:29 fenrir
+1 2003/11/05 17:57:29 gbazin
- *
- * Authors: Laurent Aimar <fenrir@via.ecp.fr>
@@ -80 +80 @@
-    input_thread_t      *p_input = (input_thread_t *)p_this;
-    demux_sys_t         *p_demux;
-
+
-    char                *psz_name;
-
@@ -94 +94 @@
-    }
-    
-
+
+
+
-    if( !psz_name || !*psz_name )
-    {

modules/gui/wxwindows/open.cpp

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 2000-2001 VideoLAN
-39 2003/10/29 17:32:54 zorglub
+40 2003/11/05 17:57:29 gbazin
- *
- * Authors: Gildas Bazin <gbazin@netcourrier.com>
@@ -92 +92 @@
-    SoutEnable_Event,
-    SoutSettings_Event,
-
-    DemuxDump_Event,
-    DemuxDumpEnable_Event,
-    DemuxDumpBrowse_Event,
-};
-
@@ -148 +144 @@
-    EVT_BUTTON(SoutSettings_Event, OpenDialog::OnSoutSettings)
-
-    /* Events generated by the demux dump buttons */
-    EVT_CHECKBOX(DemuxDumpEnable_Event, OpenDialog::OnDemuxDumpEnable)
-    EVT_TEXT(DemuxDump_Event, OpenDialog::OnDemuxDumpChange)
-    EVT_BUTTON(DemuxDumpBrowse_Event, OpenDialog::OnDemuxDumpBrowse)
-
-    /* Hide the window when the user closes the window */
-    EVT_CLOSE(OpenDialog::OnCancel)
@@ -185 +176 @@
-    sout_dialog = NULL;
-    subsfile_dialog = NULL;
-    demuxdump_dialog = NULL;
-
-    /* Create a panel to put everything in */
@@ -217 +207 @@
-
-    wxFlexGridSizer *sout_sizer = NULL;
-    wxBoxSizer *demuxdump_sizer = NULL;
-    wxStaticLine *static_line = NULL;
-
-    demuxdump_checkbox = NULL;
-    demuxdump_textctrl = NULL;
-
-    if( i_method == OPEN_NORMAL )
@@ -249 +235 @@
-        sout_sizer->Add( sout_button, 1, wxALIGN_LEFT |
-                         wxALIGN_CENTER_VERTICAL );
-
-        /* Create Demux Dump checkox */
-        demuxdump_sizer = new wxBoxSizer( wxHORIZONTAL );
-        demuxdump_checkbox = new wxCheckBox( panel, DemuxDumpEnable_Event,
-                                   wxU(_("Capture input stream")) );
-        demuxdump_checkbox->SetToolTip(
-             wxU(_("Capture the stream you are playing to a file")) );
-        demuxdump_textctrl = new wxTextCtrl( panel, DemuxDump_Event, wxT(""),
-                                             wxDefaultPosition, wxDefaultSize,
-                                             wxTE_PROCESS_ENTER );
-       demuxdump_button = new wxButton( panel, DemuxDumpBrowse_Event,
-                                         wxU(_("Browse...")) );
-
-        char *psz_demuxdump = config_GetPsz( p_intf, "demuxdump-file" );
-        if( psz_demuxdump && *psz_demuxdump )
-        {
-            demuxdump_textctrl->SetValue( wxU(psz_demuxdump) );
-        }
-        if( psz_demuxdump ) free( psz_demuxdump );
-
-        demuxdump_textctrl->Disable();
-        demuxdump_button->Disable();
-        demuxdump_sizer->Add( demuxdump_checkbox, 0,
-                               wxALIGN_LEFT | wxALIGN_CENTER_VERTICAL );
-        demuxdump_sizer->Add( demuxdump_button, 0,
-                              wxLEFT | wxRIGHT | wxALIGN_CENTER_VERTICAL, 10 );
-        demuxdump_sizer->Add( demuxdump_textctrl, 1, wxRIGHT, 10 );
-
-        /* Separation */
@@ -336 +295 @@
-    {
-        panel_sizer->Add( sout_sizer, 0, wxALIGN_LEFT | wxALL, 5 );
-        panel_sizer->Add( demuxdump_sizer, 0, wxEXPAND | wxALIGN_LEFT
-                          | wxALL, 5 );
-        panel_sizer->Add( static_line, 0, wxEXPAND | wxALL, 5 );
-    }
@@ -357 +314 @@
-    if( sout_dialog ) delete sout_dialog;
-    if( subsfile_dialog ) delete subsfile_dialog;
-    if( demuxdump_dialog ) delete demuxdump_dialog;
-}
-
@@ -640 +596 @@
-    i_current_access_method = i_access_method;
-
-    /* Check if the user asked for demuxdump */
-    if( demuxdump_checkbox )
-    {
-        if( demuxdump_checkbox->GetValue() )
-        {
-            demux = wxT("/demuxdump");
-        }
-    }
-    switch( i_access_method )
-    {
@@ -1014 +962 @@
-{
-    subsfile_button->Enable( event.GetInt() != 0 );
-    if( demuxdump_checkbox )
-    {
-        if( event.GetInt() && demuxdump_checkbox->IsChecked() )
-        {
-            demuxdump_checkbox->SetValue( 0 );
-            wxCommandEvent event = wxCommandEvent( wxEVT_NULL );
-            event.SetInt( 0 );
-            OnDemuxDumpEnable( event );
-        }
-    }
-}
-
@@ -1053 +991 @@
-{
-    sout_button->Enable( event.GetInt() != 0 );
-    if( event.GetInt() && demuxdump_checkbox->IsChecked() )
-    {
-        demuxdump_checkbox->SetValue( 0 );
-        wxCommandEvent event = wxCommandEvent( wxEVT_NULL );
-        event.SetInt( 0 );
-        OnDemuxDumpEnable( event );
-    }
-}
-
@@ -1072 +1003 @@
-        sout_mrl = sout_dialog->GetOptions();
-    }
-}
-
-/*****************************************************************************
- * Demux dump event methods.
- *****************************************************************************/
-void OpenDialog::OnDemuxDumpEnable( wxCommandEvent& event )
-{
-    demuxdump_textctrl->Enable( event.GetInt() != 0 );
-    demuxdump_button->Enable( event.GetInt() != 0 );
-
-    if( event.GetInt() )
-    {
-        sout_checkbox->SetValue( 0 );
-        subsfile_checkbox->SetValue( 0 );
-        wxCommandEvent event = wxCommandEvent( wxEVT_NULL );
-        event.SetInt( 0 );
-        OnSoutEnable( event );
-        OnSubsFileEnable( event );
-    }
-
-    UpdateMRL( i_current_access_method );
-}
-
-void OpenDialog::OnDemuxDumpBrowse( wxCommandEvent& WXUNUSED(event) )
-{
-    if( demuxdump_dialog == NULL )
-        demuxdump_dialog = new wxFileDialog( this, wxU(_("Save file")),
-                               wxT(""), wxT(""), wxT("*"), wxSAVE );
-
-    if( demuxdump_dialog && demuxdump_dialog->ShowModal() == wxID_OK )
-    {
-        demuxdump_textctrl->SetValue( demuxdump_dialog->GetPath() );
-        wxCommandEvent event = wxCommandEvent( wxEVT_NULL );
-        OnDemuxDumpChange( event );
-    }
-}
-
-void OpenDialog::OnDemuxDumpChange( wxCommandEvent& WXUNUSED(event) )
-{
-    config_PutPsz( p_intf, "demuxdump-file",
-                   demuxdump_textctrl->GetValue().mb_str() );
-}
-

modules/gui/wxwindows/streamout.cpp

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 2000-2001 VideoLAN
-3 2003/10/27 22:13:36
+4 2003/11/05 17:57:29
- *
- * Authors: Gildas Bazin <gbazin@netcourrier.com>
@@ -56 +56 @@
-    FileBrowse_Event,
-    FileName_Event,
+    FileDump_Event,
-
-    AccessType1_Event, AccessType2_Event, AccessType3_Event,
@@ -88 +89 @@
-    EVT_TEXT(FileName_Event, SoutDialog::OnFileChange)
-    EVT_BUTTON(FileBrowse_Event, SoutDialog::OnFileBrowse)
+    EVT_CHECKBOX(FileDump_Event, SoutDialog::OnFileDump)
-
-    EVT_TEXT(NetPort1_Event, SoutDialog::OnNetChange)
@@ -137 +139 @@
-END_EVENT_TABLE()
-
+#if 0
+/*****************************************************************************
+ * Demux dump event methods.
+ *****************************************************************************/
+void OpenDialog::OnDemuxDumpEnable( wxCommandEvent& event )
+{
+    demuxdump_textctrl->Enable( event.GetInt() != 0 );
+    demuxdump_button->Enable( event.GetInt() != 0 );
+
+    if( event.GetInt() )
+    {
+        sout_checkbox->SetValue( 0 );
+        subsfile_checkbox->SetValue( 0 );
+        wxCommandEvent event = wxCommandEvent( wxEVT_NULL );
+        event.SetInt( 0 );
+        OnSoutEnable( event );
+        OnSubsFileEnable( event );
+    }
+
+    UpdateMRL( i_current_access_method );
+}
+
+void OpenDialog::OnDemuxDumpChange( wxCommandEvent& WXUNUSED(event) )
+{
+}
+#endif
+
-/*****************************************************************************
- * Constructor.
@@ -172 +201 @@
-
-    /* Create the output encapsulation panel */
-wxPanel *
+
-
-    /* Create the access output panel */
-wxPanel *
+
-
-    /* Create the transcoding panel */
-wxPanel *
+
-
-    /* Create the Misc panel */
-wxPanel *
+
-
-    /* Separation */
@@ -228 +257 @@
-void SoutDialog::UpdateMRL()
-{
+    /* Check the demux dump option */
+    if( dump_checkbox->IsChecked() )
+    {
+        wxString dumpfile;
+
+        if( file_combo->GetValue().size() )
+            dumpfile = wxT(" :demuxdump-file=\"") +
+                       file_combo->GetValue() + wxT("\"");
+        mrl_combo->SetValue( wxT(":demux=demuxdump") + dumpfile );
+
+        return;
+    }
+
-    /* Let's start with the transcode options */
-    wxString transcode;
@@ -405 +447 @@
-
-    /* File row */
-1
+2
-    label = new wxStaticText( access_subpanels[1], -1, wxU(_("Filename")) );
-    file_combo = new wxComboBox( access_subpanels[1], FileName_Event, wxT(""),
@@ -416 +458 @@
-    subpanel_sizer->Add( browse_button, 0,
-                         wxALIGN_LEFT | wxALIGN_CENTER_VERTICAL );
+    subpanel_sizer->Add( new wxPanel(access_subpanels[1], -1), 0,
+                         wxALIGN_RIGHT | wxALIGN_CENTER_VERTICAL );
+    subpanel_sizer->Add( new wxPanel(access_subpanels[1], -1), 0,
+                         wxALIGN_RIGHT | wxALIGN_CENTER_VERTICAL );
+    dump_checkbox = new wxCheckBox( access_subpanels[1], FileDump_Event,
+                                    wxU(_("Dump raw input")) );
+    subpanel_sizer->Add( dump_checkbox, 0,
+                         wxALIGN_LEFT | wxALIGN_CENTER_VERTICAL | wxTOP, 5 );
-
-    access_subpanels[1]->SetSizerAndFit( subpanel_sizer );
@@ -818 +868 @@
-}
-
+void SoutDialog::OnFileDump( wxCommandEvent& event )
+{
+    misc_panel->Enable( !event.GetInt() );
+    encapsulation_panel->Enable( !event.GetInt() );
+    transcoding_panel->Enable( !event.GetInt() );
+
+    for( int i = 0; i < ACCESS_OUT_NUM; i++ )
+    {
+        if( i != FILE_ACCESS_OUT )
+        {
+            access_subpanels[i]->Enable( !event.GetInt() );
+            access_checkboxes[i]->Enable( !event.GetInt() );
+        }
+    }
+
+    UpdateMRL();
+}
+
-/*****************************************************************************
- * Net access output event methods.

modules/gui/wxwindows/wxwindows.h

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 1999, 2000 VideoLAN
-6 2003/10/29 17:32:54 zorglub
+7 2003/11/05 17:57:29 gbazin
- *
- * Authors: Gildas Bazin <gbazin@netcourrier.com>
@@ -352 +352 @@
-    void OnSoutSettings( wxCommandEvent& WXUNUSED(event) );
-
-    /* Event handlers for the demux dump */
-    void OnDemuxDumpEnable( wxCommandEvent& event );
-    void OnDemuxDumpBrowse( wxCommandEvent& event );
-    void OnDemuxDumpChange( wxCommandEvent& event );
-
-    DECLARE_EVENT_TABLE();
-
@@ -407 +402 @@
-    SoutDialog *sout_dialog;
-    wxArrayString sout_mrl;
-
-    /* Controls for the demux dump */
-    wxTextCtrl *demuxdump_textctrl;
-    wxButton *demuxdump_button;
-    wxCheckBox *demuxdump_checkbox;
-    wxFileDialog *demuxdump_dialog;
-};
-
@@ -550 +539 @@
-    void OnFileChange( wxCommandEvent& event );
-    void OnFileBrowse( wxCommandEvent& event );
+    void OnFileDump( wxCommandEvent& event );
-
-    /* Event handlers for the net access output */
@@ -576 +566 @@
-
-    /* Controls for the access outputs */
+    wxPanel *access_panel;
-    wxPanel *access_subpanels[ACCESS_OUT_NUM];
-    wxCheckBox *access_checkboxes[ACCESS_OUT_NUM];
@@ -582 +573 @@
-
-    wxComboBox *file_combo;
+    wxCheckBox *dump_checkbox;
-    wxSpinCtrl *net_ports[ACCESS_OUT_NUM];
-    wxTextCtrl *net_addrs[ACCESS_OUT_NUM];
-
-    /* Controls for the SAP announces */
+    wxPanel *misc_panel;
-    wxPanel *misc_subpanels[MISC_SOUT_NUM];
-    wxCheckBox *sap_checkbox;
@@ -592 +585 @@
-
-    /* Controls for the encapsulation */
+    wxPanel *encapsulation_panel;
-    wxRadioButton *encapsulation_radios[ENCAPS_NUM];
-    int i_encapsulation_type;
-
-    /* Controls for transcoding */
+    wxPanel *transcoding_panel;
-    wxCheckBox *video_transc_checkbox;
-    wxComboBox *video_codec_combo;

src/input/input.c

@@ -5 +5 @@
- *****************************************************************************
- * Copyright (C) 1998-2002 VideoLAN
-1 2003/11/04 02:23:11 fenrir
+2 2003/11/05 17:57:29 gbazin
- *
- * Authors: Christophe Massiot <massiot@via.ecp.fr>
@@ -707 +707 @@
-
-    /* Find and open appropriate demux module */
-
-
+
+
+
+
-
-    if( p_input->p_demux == NULL )
@@ -945 +947 @@
-
-    case VLC_VAR_STRING:
+    case VLC_VAR_MODULE:
-    case VLC_VAR_FILE:
-    case VLC_VAR_DIRECTORY:

src/misc/configuration.c

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 2001 VideoLAN
-7 2003/11/05 00:39:17
+8 2003/11/05 17:57:29
- *
- * Authors: Gildas Bazin <gbazin@netcourrier.com>
@@ -96 +96 @@
-
-    case CONFIG_ITEM_MODULE:
+        i_type = VLC_VAR_MODULE;
+        break;
+
-    case CONFIG_ITEM_STRING:
-        i_type = VLC_VAR_STRING;

src/misc/modules.c

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 2001 VideoLAN
-7 2003/10/07 09:32:48
+8 2003/11/05 17:57:29
- *
- * Authors: Sam Hocevar <sam@zoy.org>
@@ -289 +289 @@
-    if( psz_name && psz_name[0] == '$' )
-    {
-
+
+
+
+
-        psz_name = psz_var;
-    }

src/misc/variables.c

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 2002 VideoLAN
-3 2003/10/29 01:33:27
+4 2003/11/05 17:57:29
- *
- * Authors: Samuel Hocevar <sam@zoy.org>
@@ -1157 +1157 @@
-        case VLC_VAR_DIRECTORY:
-        case VLC_VAR_STRING:
+        case VLC_VAR_MODULE:
-            p_val->psz_string = config_GetPsz( p_this, psz_name );
-            if( !p_val->psz_string ) p_val->psz_string = strdup("");