[vlc-devel] commit: Qt4: fix transcode/stream character encoding - fixes #2411 ( Rémi Denis-Courmont )

[git version control]

vlc | branch: 0.9-bugfix | Rémi Denis-Courmont <rdenis at simphalempin.com> | Wed Jan 14 19:27:31 2009 +0200| [ee050aedeb6a1f9c26002c1bf385ef24ec8c5919] | committer: Rémi Denis-Courmont 

Qt4: fix transcode/stream character encoding - fixes #2411

(cherry picked from commit 81dc2e727a2b9a89cb4726bfae8789a2d442f306)

Conflicts:

	modules/gui/qt4/dialogs/sout.cpp

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

 modules/gui/qt4/dialogs/sout.cpp |   26 +++++++++++++-------------
 1 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/modules/gui/qt4/dialogs/sout.cpp b/modules/gui/qt4/dialogs/sout.cpp
index 5c1c46a..9e4dbc6 100644
--- a/modules/gui/qt4/dialogs/sout.cpp
+++ b/modules/gui/qt4/dialogs/sout.cpp
@@ -459,7 +459,7 @@ void SoutDialog::updateMRL()
         {
             mrl = ":sout=#transcode{";
             mrl.append( "vcodec=" );
-            mrl.append( sout.psz_vcodec );
+            mrl.append( qfu( sout.psz_vcodec ) );
             mrl.append( "," );
             mrl.append( "vb=" );
             mrl.append( QString::number( sout.i_vb,10 ) );
@@ -480,7 +480,7 @@ void SoutDialog::updateMRL()
                 mrl = ":sout=#transcode{";
             }
             mrl.append( "acodec=" );
-            mrl.append( sout.psz_acodec );
+            mrl.append( qfu( sout.psz_acodec ) );
             mrl.append( "," );
             mrl.append( "ab=" );
             mrl.append( QString::number( sout.i_ab,10 ) );
@@ -496,7 +496,7 @@ void SoutDialog::updateMRL()
     if ( sout.b_file && sout.b_dump )
     {
         mrl = ":demux=dump :demuxdump-file=";
-        mrl.append( sout.psz_file );
+        mrl.append( qfu( sout.psz_file ) );
     }
     else
 
@@ -539,7 +539,7 @@ void SoutDialog::updateMRL()
             mrl.append( "std{access=file" );
             CHECKMUX();
             mrl.append( ",dst=" );
-            mrl.append( sout.psz_file );
+            mrl.append( qfu( sout.psz_file ) );
             mrl.append( "}" );
             more = true;
         }
@@ -551,7 +551,7 @@ void SoutDialog::updateMRL()
             mrl.append( "std{access=http" );
             CHECKMUX();
             mrl.append( ",dst=" );
-            mrl.append( sout.psz_http );
+            mrl.append( qfu( sout.psz_http ) );
             mrl.append( ":" );
             mrl.append( QString::number( sout.i_http,10 ) );
             mrl.append( "}" );
@@ -565,7 +565,7 @@ void SoutDialog::updateMRL()
             mrl.append( "std{access=mmsh" );
             CHECKMUX();
             mrl.append( ",dst=" );
-            mrl.append( sout.psz_mms );
+            mrl.append( qfu( sout.psz_mms ) );
             mrl.append( ":" );
             mrl.append( QString::number( sout.i_mms,10 ) );
             mrl.append( "}" );
@@ -581,7 +581,7 @@ void SoutDialog::updateMRL()
                 mrl.append( "std{access=udp" );
                 CHECKMUX();
                 mrl.append( ",dst=" );
-                mrl.append( sout.psz_udp );
+                mrl.append( qfu( sout.psz_udp ) );
                 mrl.append( ":" );
                 mrl.append( QString::number( sout.i_udp,10 ) );
             }
@@ -589,7 +589,7 @@ void SoutDialog::updateMRL()
             {
                 mrl.append( "rtp{" );
                 mrl.append( "dst=" );
-                mrl.append( sout.psz_rtp );
+                mrl.append( qfu( sout.psz_rtp ) );
                 CHECKMUX();
                 mrl.append( ",port=" );
                 mrl.append( QString::number( sout.i_rtp,10 ) );
@@ -607,10 +607,10 @@ void SoutDialog::updateMRL()
             {
                 mrl.append( ",sap," );
                 mrl.append( "group=\"" );
-                mrl.append( sout.psz_group );
+                mrl.append( qfu( sout.psz_group ) );
                 mrl.append( "\"," );
                 mrl.append( "name=\"" );
-                mrl.append( sout.psz_name );
+                mrl.append( qfu( sout.psz_name ) );
                 mrl.append( "\"" );
             }
 
@@ -624,13 +624,13 @@ void SoutDialog::updateMRL()
             ATLEASTONE();
             mrl.append( "std{access=shout,mux=ogg" );
             mrl.append( ",dst=" );
-            mrl.append( sout.sa_icecast.psz_username );
+            mrl.append( qfu( sout.sa_icecast.psz_username ) );
             mrl.append( "@" );
-            mrl.append( sout.psz_icecast );
+            mrl.append( qfu( sout.psz_icecast ) );
             mrl.append( ":" );
             mrl.append( QString::number( sout.i_icecast, 10 ) );
             mrl.append( "/" );
-            mrl.append( sout.psz_icecast_mountpoint );
+            mrl.append( qfu( sout.psz_icecast_mountpoint ) );
             mrl.append( "}" );
             more = true;
         }