[vlc-devel] commit: Fix typos and stupid code errors to make profiles work. ( Jean-Baptiste Kempf )

[git version control]

vlc | branch: 0.9-bugfix | Jean-Baptiste Kempf <jb at videolan.org> | Sun Aug 24 23:03:52 2008 -0700| [73bf184d689587fd216ad31dbaece01e935a3944] | committer: Christophe Mutricy 

Fix typos and stupid code errors to make profiles work.
(cherry picked from commit 8098c107ec4ee2e3f1155808dc0bc4ea6dd256d7)

Signed-off-by: Christophe Mutricy <xtophe at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=73bf184d689587fd216ad31dbaece01e935a3944
---

 modules/gui/qt4/components/interface_widgets.cpp |    1 -
 modules/gui/qt4/dialogs/sout.cpp                 |   26 ++++++++++++++++-----
 2 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/modules/gui/qt4/components/interface_widgets.cpp b/modules/gui/qt4/components/interface_widgets.cpp
index 8fc9193..1e8fc47 100644
--- a/modules/gui/qt4/components/interface_widgets.cpp
+++ b/modules/gui/qt4/components/interface_widgets.cpp
@@ -458,7 +458,6 @@ void AdvControlsWidget::AtoBLoop( float f_pos, int i_time, int i_length )
     }
 }
 
-/* FIXME Record function */
 void AdvControlsWidget::record()
 {
     input_thread_t *p_input = THEMIM->getInput();
diff --git a/modules/gui/qt4/dialogs/sout.cpp b/modules/gui/qt4/dialogs/sout.cpp
index 7bf522b..6ba8dce 100644
--- a/modules/gui/qt4/dialogs/sout.cpp
+++ b/modules/gui/qt4/dialogs/sout.cpp
@@ -111,11 +111,17 @@ SoutDialog::SoutDialog( QWidget *parent, intf_thread_t *_p_intf,
 /* ADD HERE for new profiles */
 #define ADD_PROFILE( name, shortname ) ui.profileBox->addItem( qtr( name ), QVariant( QString( shortname ) ) );
     ADD_PROFILE( "Custom" , "Custom" )
+    ADD_PROFILE( "Ogg / Theora", "theora" )
+    ADD_PROFILE( "Ogg / Vorbis", "vorbis" )
+    ADD_PROFILE( "MPEG-2", "mpeg2" )
+    ADD_PROFILE( "MP3", "mp3" )
+    ADD_PROFILE( "MPEG-4 audio AAC", "aac" )
+    ADD_PROFILE( "MPEG-4 / DivX", "mp4" )
+    ADD_PROFILE( "H264", "h264" )
     ADD_PROFILE( "IPod (mp4/aac)", "IPod" )
     ADD_PROFILE( "XBox", "XBox" )
     ADD_PROFILE( "Windows (wmv/asf)", "Windows" )
     ADD_PROFILE( "PSP", "PSP")
-    ADD_PROFILE( "GSM", "GSM" )
 
 #define ADD_VCODEC( name, fourcc ) ui.vCodecBox->addItem( name, QVariant( fourcc ) );
     ADD_VCODEC( "MPEG-1", "mp1v" )
@@ -267,18 +273,26 @@ void SoutDialog::setOptions()
         ui.muxName ##Mux->setChecked( true ); \
         \
         ui.transcodeAudio->setChecked( hasAudio ); \
-        index = ui.aCodecBox->findText( vCodecName );  \
+        index = ui.aCodecBox->findData( aCodecName );  \
         if( index >= 0 ) ui.aCodecBox->setCurrentIndex( index ); \
         \
         ui.transcodeVideo->setChecked( hasVideo ); \
-        index = ui.aCodecBox->findText( vCodecName );  \
+        index = ui.vCodecBox->findData( vCodecName );  \
         if( index >=0 ) ui.vCodecBox->setCurrentIndex( index ); \
     }
 
     /* ADD HERE the profiles you want and need */
-    /* FIXME */
-    if( profileString == "IPod" ) setProfile( MP4, true, "mp4a", true, "mp4v" )
-    else if( profileString == "XBox" ) setProfile( ASF, true, "wma", true, "WMV2" )
+    if( profileString == "IPod" ) setProfile( MP4, true, "mp4v", true, "mp4a" )
+    else if( profileString == "theora" ) setProfile( Ogg, true, "theo", true, "vorb" )
+    else if( profileString == "vorbis" ) setProfile( Ogg, false, "", true, "vorb" )
+    else if( profileString == "mpeg2" ) setProfile( TS, true, "mp2v", true, "mpga" )
+    else if( profileString == "mp3" ) setProfile( RAW, false, "", true, "mp3" )
+    else if( profileString == "aac" ) setProfile( MP4, false, "", true, "mp4a" )
+    else if( profileString == "mp4" ) setProfile( MP4, true, "mp4v", true, "mp4a" )
+    else if( profileString == "h264" ) setProfile( TS, true, "h264", true, "mp4a" )
+    else if( profileString == "XBox" ) setProfile( ASF, true, "WMV2", true, "wma" )
+    else if( profileString == "Windows" ) setProfile( ASF, true, "WMV2", true, "wma" )
+    else if( profileString == "PSP" ) setProfile( Ogg, true, "DIV3", true, "vorb" )
 
         /* If the profile is not a custom one, then disable the tabWidget */
         if ( profileString == "Custom" )