* modules/gui/wxwindows/streamout.cpp: removed avi muxer + added wav muxer and a...

diff --git a/modules/gui/wxwindows/streamout.cpp b/modules/gui/wxwindows/streamout.cpp
index 2940330f9e56ab29883137ed61c4c063366e03bd..857550972021c8e0759f38bffedee4d5ffeaf17e 100644 (file)
--- a/modules/gui/wxwindows/streamout.cpp
+++ b/modules/gui/wxwindows/streamout.cpp
@@ -65,7 +65,7 @@ enum
     EncapsulationRadio3_Event, EncapsulationRadio4_Event,
     EncapsulationRadio5_Event, EncapsulationRadio6_Event,
     EncapsulationRadio7_Event, EncapsulationRadio8_Event,
-    EncapsulationRadio9_Event,
+    EncapsulationRadio9_Event, EncapsulationRadio10_Event,
 
     VideoTranscEnable_Event, VideoTranscCodec_Event, VideoTranscBitrate_Event,
     VideoTranscScale_Event,
@@ -297,6 +297,9 @@ void SoutDialog::UpdateMRL()
     case ASF_ENCAPSULATION:
         encapsulation = wxT("asf");
         break;
+    case WAV_ENCAPSULATION:
+        encapsulation = wxT("wav");
+        break;
     case TS_ENCAPSULATION:
     default:
         encapsulation = wxT("ts");
@@ -588,15 +591,15 @@ wxPanel *SoutDialog::EncapsulationPanel( wxWindow* parent )
         wxT("MPEG PS"),
         wxT("MPEG 1"),
         wxT("Ogg"),
-        wxT("Raw"),
         wxT("ASF"),
-        wxT("AVI"),
         wxT("MP4"),
-        wxT("MOV")
+        wxT("MOV"),
+        wxT("WAV"),
+        wxT("Raw")
     };
 
     /* Stuff everything into the main panel */
-    for( i=0; i < ENCAPS_NUM; i++ )
+    for( i = 0; i < WXSIZEOF(encapsulation_array); i++ )
     {
         encapsulation_radios[i] =
             new wxRadioButton( panel, EncapsulationRadio1_Event + i,
@@ -605,6 +608,13 @@ wxPanel *SoutDialog::EncapsulationPanel( wxWindow* parent )
                           wxALIGN_LEFT | wxALIGN_CENTER_VERTICAL |
                           wxALL, 4 );
     }
+    /* Hide avi one */
+    for( i = WXSIZEOF(encapsulation_array); i < ENCAPS_NUM; i++ )
+    {
+        encapsulation_radios[i] =
+            new wxRadioButton( panel, EncapsulationRadio1_Event + i, wxT("") );
+        encapsulation_radios[i]->Hide();
+    }
 
     panel->SetSizerAndFit( panel_sizer );
 
@@ -710,12 +720,15 @@ wxPanel *SoutDialog::TranscodingPanel( wxWindow* parent )
     static const wxString wxacodecs_array[] =
     {
         wxT("mpga"),
+        wxT("mp2a"),
         wxT("mp3"),
         wxT("mp4a"),
         wxT("a52"),
         wxT("vorb"),
         wxT("flac"),
-        wxT("spx")
+        wxT("spx"),
+        wxT("s16l"),
+        wxT("fl32")
     };
     static const wxString achannels_array[] =
     {

diff --git a/modules/gui/wxwindows/wxwindows.h b/modules/gui/wxwindows/wxwindows.h
index 9801a914feff1f34ec3c423f0a41a5a35026a0e8..1c46bbc05de34eaf885720a42e29aee651aa9faf 100644 (file)
--- a/modules/gui/wxwindows/wxwindows.h
+++ b/modules/gui/wxwindows/wxwindows.h
@@ -518,11 +518,12 @@ enum
     PS_ENCAPSULATION,
     MPEG1_ENCAPSULATION,
     OGG_ENCAPSULATION,
-    RAW_ENCAPSULATION,
     ASF_ENCAPSULATION,
-    AVI_ENCAPSULATION,
     MP4_ENCAPSULATION,
     MOV_ENCAPSULATION,
+    WAV_ENCAPSULATION,
+    RAW_ENCAPSULATION,
+    AVI_ENCAPSULATION,
     ENCAPS_NUM
 };