* modules/gui/wxwindows/*: added raw encapsulation to the streamout dialog.

* modules/mux/dummy.c: added "raw" shortcut.

modules/gui/wxwindows/streamout.cpp

@@ -2,7 +2,7 @@
  * streamout.cpp : wxWindows plugin for vlc
  *****************************************************************************
  * Copyright (C) 2000-2001 VideoLAN
- * $Id: streamout.cpp,v 1.39 2003/12/14 21:03:27 gbazin Exp $
+ * $Id: streamout.cpp,v 1.40 2003/12/14 22:49:28 gbazin Exp $
  *
  * Authors: Gildas Bazin <gbazin@netcourrier.com>
  *
@@ -66,6 +66,7 @@ enum
     EncapsulationRadio3_Event, EncapsulationRadio4_Event,
     EncapsulationRadio5_Event, EncapsulationRadio6_Event,
     EncapsulationRadio7_Event, EncapsulationRadio8_Event,
+    EncapsulationRadio9_Event,
 
     VideoTranscEnable_Event, VideoTranscCodec_Event, VideoTranscBitrate_Event,
     VideoTranscScale_Event,
@@ -117,6 +118,8 @@ BEGIN_EVENT_TABLE(SoutDialog, wxDialog)
                     SoutDialog::OnEncapsulationChange)
     EVT_RADIOBUTTON(EncapsulationRadio8_Event,
                     SoutDialog::OnEncapsulationChange)
+    EVT_RADIOBUTTON(EncapsulationRadio9_Event,
+                    SoutDialog::OnEncapsulationChange)
 
     /* Events generated by the transcoding panel */
     EVT_CHECKBOX(VideoTranscEnable_Event, SoutDialog::OnTranscodingEnable)
@@ -283,6 +286,9 @@ void SoutDialog::UpdateMRL()
     case OGG_ENCAPSULATION:
         encapsulation = wxT("ogg");
         break;
+    case RAW_ENCAPSULATION:
+        encapsulation = wxT("raw");
+        break;
     case MP4_ENCAPSULATION:
         encapsulation = wxT("mp4");
         break;
@@ -574,6 +580,7 @@ wxPanel *SoutDialog::EncapsulationPanel( wxWindow* parent )
         wxT("MPEG PS"),
         wxT("MPEG 1"),
         wxT("Ogg"),
+        wxT("Raw"),
         wxT("ASF"),
         wxT("AVI"),
         wxT("MP4"),
@@ -920,6 +927,7 @@ void SoutDialog::OnTranscodingEnable( wxCommandEvent& event )
     case VideoTranscEnable_Event:
         video_codec_combo->Enable( event.GetInt() );
         video_bitrate_combo->Enable( event.GetInt() );
+        video_scale_combo->Enable( event.GetInt() );
         break;
     case AudioTranscEnable_Event:
         audio_codec_combo->Enable( event.GetInt() );

modules/gui/wxwindows/wxwindows.h

@@ -2,7 +2,7 @@
  * wxwindows.h: private wxWindows interface description
  *****************************************************************************
  * Copyright (C) 1999, 2000 VideoLAN
- * $Id: wxwindows.h,v 1.79 2003/12/14 21:03:27 gbazin Exp $
+ * $Id: wxwindows.h,v 1.80 2003/12/14 22:49:28 gbazin Exp $
  *
  * Authors: Gildas Bazin <gbazin@netcourrier.com>
  *
@@ -515,6 +515,7 @@ enum
     PS_ENCAPSULATION,
     MPEG1_ENCAPSULATION,
     OGG_ENCAPSULATION,
+    RAW_ENCAPSULATION,
     ASF_ENCAPSULATION,
     AVI_ENCAPSULATION,
     MP4_ENCAPSULATION,

modules/mux/dummy.c

@@ -2,7 +2,7 @@
  * dummy.c: dummy muxer module for vlc
  *****************************************************************************
  * Copyright (C) 2001, 2002 VideoLAN
- * $Id: dummy.c,v 1.9 2003/11/21 20:49:14 gbazin Exp $
+ * $Id: dummy.c,v 1.10 2003/12/14 22:49:28 gbazin Exp $
  *
  * Authors: Laurent Aimar <fenrir@via.ecp.fr>
  *          Eric Petit <titer@videolan.org>
@@ -43,6 +43,7 @@ vlc_module_begin();
     set_description( _("Dummy/Raw muxer") );
     set_capability( "sout mux", 5 );
     add_shortcut( "dummy" );
+    add_shortcut( "raw" );
     add_shortcut( "es" );
     set_callbacks( Open, Close );
 vlc_module_end();