Skip to content

V
vlc-2-2
Commit 28de87ba authored by Gildas Bazin's avatar Gildas Bazin
Browse files
Options 

* modules/gui/wxwindows/streamout.cpp, wxwindows.h: added an audio channels combobox for transcoding.
* NEWS: update in preparation for 0.6.1.
parent fec78c9a
Hide whitespace changes
Inline Side-by-side
Showing with 65 additions and 10 deletions
NEWS
View file @ 28de87ba
$Id: NEWS,v 1.54 2003/06/23 11:41:25 zorglub Exp $
$Id: NEWS,v 1.55 2003/07/11 23:36:01 gbazin Exp $
Changes between 0.6.0 and 0.6.1:
---------------------------------
Stream output:
* Added vorbis audio support in Ogg streaming.
* Added vorbis audio transcoding support.
* Added mp3 audio transcoding support (when ffmpeg is compiled with mp3lame).
Win32 port:
* Fixed DVD support which was partly broken due to a bug in libdvdcss
* Fixed 5.1 audio support for the sblive/audigy soundcards.
UNIX ports:
* Fixed/improved alsa support and enabled multi-channel audio output.
Interfaces:
* Small updates/fixes to the wxWindows interface.
* Improved HTTP remote control interface.
Input demux:
* Improved support for the Matroska container format.
Miscellaneous:
* Improved build system.
* New video filter plugin to overlay logos.
* Added support for Winamp 3 B4S files.
Changes between 0.5.3 and 0.6.0:
---------------------------------
......
modules/gui/wxwindows/streamout.cpp
View file @ 28de87ba
......@@ -2,7 +2,7 @@
* streamout.cpp : wxWindows plugin for vlc
*****************************************************************************
* Copyright (C) 2000-2001 VideoLAN
* $Id: streamout.cpp,v 1.22 2003/07/07 15:50:44 gbazin Exp $
* $Id: streamout.cpp,v 1.23 2003/07/11 23:36:01 gbazin Exp $
*
* Authors: Gildas Bazin <gbazin@netcourrier.com>
*
......@@ -109,6 +109,7 @@ enum
VideoTranscEnable_Event, VideoTranscCodec_Event, VideoTranscBitrate_Event,
AudioTranscEnable_Event, AudioTranscCodec_Event, AudioTranscBitrate_Event,
AudioTranscChans_Event,
SAPMisc_Event, SAPAddr_Event
};
......@@ -157,6 +158,8 @@ BEGIN_EVENT_TABLE(SoutDialog, wxDialog)
EVT_TEXT(VideoTranscBitrate_Event, SoutDialog::OnTranscodingChange)
EVT_COMBOBOX(AudioTranscBitrate_Event, SoutDialog::OnTranscodingChange)
EVT_TEXT(AudioTranscBitrate_Event, SoutDialog::OnTranscodingChange)
EVT_COMBOBOX(AudioTranscChans_Event, SoutDialog::OnTranscodingChange)
EVT_TEXT(AudioTranscChans_Event, SoutDialog::OnTranscodingChange)
/* Events generated by the misc panel */
EVT_CHECKBOX(SAPMisc_Event, SoutDialog::OnSAPMiscChange)
......@@ -266,6 +269,7 @@ void SoutDialog::UpdateMRL()
{
transcode += wxT("acodec=") + audio_codec_combo->GetValue();
transcode += wxT(",ab=") + audio_bitrate_combo->GetValue();
transcode += wxT(",channels=") + audio_channels_combo->GetValue();
}
transcode += wxT("}");
}
......@@ -329,7 +333,7 @@ void SoutDialog::UpdateMRL()
{
dup_opts += wxT(",sap=\"");
dup_opts += sap_addr->GetLineText(0);
dup_opts += wxT("\"");
dup_opts += wxT("\"");
}
dup_opts += wxT("}");
......@@ -627,28 +631,50 @@ wxPanel *SoutDialog::TranscodingPanel( wxWindow* parent )
wxT("128"),
wxT("96")
};
static const wxString achannels_array[] =
{
wxT("1"),
wxT("2"),
wxT("4"),
wxT("6")
};
wxFlexGridSizer *audio_sizer = new wxFlexGridSizer( 4, 1, 20 );
wxFlexGridSizer *audio_sizer = new wxFlexGridSizer( 3, 1, 20 );
audio_transc_checkbox =
new wxCheckBox( panel, AudioTranscEnable_Event, wxU(_("Audio codec")));
audio_codec_combo =
new wxComboBox( panel, AudioTranscCodec_Event, wxT(""),
wxPoint(20,25), wxDefaultSize, WXSIZEOF(acodecs_array),
wxPoint(10,25), wxDefaultSize, WXSIZEOF(acodecs_array),
acodecs_array, wxCB_READONLY );
audio_codec_combo->SetSelection(0);
wxFlexGridSizer *audio_sub_sizer = new wxFlexGridSizer( 2, 5, 20 );
bitrate_label =
new wxStaticText( panel, -1, wxU(_("Bitrate (kb/s)")));
audio_bitrate_combo =
new wxComboBox( panel, AudioTranscBitrate_Event, wxT("192"),
wxPoint(20,25), wxDefaultSize,
wxPoint(10,25), wxDefaultSize,
WXSIZEOF(abitrates_array), abitrates_array );
wxStaticText *channels_label =
new wxStaticText( panel, -1, wxU(_("Channels")));
audio_channels_combo =
new wxComboBox( panel, AudioTranscChans_Event, wxT(""),
wxPoint(10,25), wxDefaultSize,
WXSIZEOF(achannels_array), achannels_array );
audio_channels_combo->SetSelection(1);
audio_sub_sizer->Add( bitrate_label, 0,
wxALIGN_RIGHT | wxALIGN_CENTER_VERTICAL );
audio_sub_sizer->Add( audio_bitrate_combo, 1,
wxEXPAND | wxALIGN_RIGHT | wxALIGN_CENTER_VERTICAL );
audio_sub_sizer->Add( channels_label, 0,
wxALIGN_RIGHT | wxALIGN_CENTER_VERTICAL );
audio_sub_sizer->Add( audio_channels_combo, 1,
wxEXPAND | wxALIGN_RIGHT | wxALIGN_CENTER_VERTICAL );
audio_sizer->Add( audio_transc_checkbox, 0,
wxALIGN_RIGHT | wxALIGN_CENTER_VERTICAL );
audio_sizer->Add( audio_codec_combo, 1,
wxEXPAND | wxALIGN_RIGHT | wxALIGN_CENTER_VERTICAL );
audio_sizer->Add( bitrate_label, 0,
wxALIGN_RIGHT | wxALIGN_CENTER_VERTICAL );
audio_sizer->Add( audio_bitrate_combo, 1,
audio_sizer->Add( audio_sub_sizer, 1,
wxEXPAND | wxALIGN_RIGHT | wxALIGN_CENTER_VERTICAL );
/* Stuff everything into the main panel */
......@@ -788,6 +814,7 @@ void SoutDialog::OnTranscodingEnable( wxCommandEvent& event )
case AudioTranscEnable_Event:
audio_codec_combo->Enable( event.GetInt() );
audio_bitrate_combo->Enable( event.GetInt() );
audio_channels_combo->Enable( event.GetInt() );
break;
}
......
modules/gui/wxwindows/wxwindows.h
View file @ 28de87ba
......@@ -2,7 +2,7 @@
* wxwindows.h: private wxWindows interface description
*****************************************************************************
* Copyright (C) 1999, 2000 VideoLAN
* $Id: wxwindows.h,v 1.40 2003/07/10 11:15:18 adn Exp $
* $Id: wxwindows.h,v 1.41 2003/07/11 23:36:01 gbazin Exp $
*
* Authors: Gildas Bazin <gbazin@netcourrier.com>
*
......@@ -369,6 +369,7 @@ private:
wxCheckBox *audio_transc_checkbox;
wxComboBox *video_bitrate_combo;
wxComboBox *audio_bitrate_combo;
wxComboBox *audio_channels_combo;
};
/* Subtitles File Dialog */
......
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