[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdemultimedia/kmix
From:       Colin Guthrie <kde () colin ! guthr ! ie>
Date:       2010-06-14 19:15:06
Message-ID: 20100614191506.17ED7AC8D3 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1137952 by cguthrie:

kmix: Fix PulseAudio UTF8 encoding issues

 M  +12 -12    mixer_pulse.cpp  


--- trunk/KDE/kdemultimedia/kmix/mixer_pulse.cpp #1137951:1137952
@@ -144,18 +144,18 @@
     const char *t;
 
     if ((t = pa_proplist_gets(l, PA_PROP_MEDIA_ICON_NAME)))
-        return t;
+        return QString::fromUtf8(t);
 
     if ((t = pa_proplist_gets(l, PA_PROP_WINDOW_ICON_NAME)))
-        return t;
+        return QString::fromUtf8(t);
 
     if ((t = pa_proplist_gets(l, PA_PROP_APPLICATION_ICON_NAME)))
-        return t;
+        return QString::fromUtf8(t);
 
     if ((t = pa_proplist_gets(l, PA_PROP_MEDIA_ROLE))) {
 
         if (strcmp(t, "video") == 0 || strcmp(t, "phone") == 0)
-            return t;
+            return QString::fromUtf8(t);
 
         if (strcmp(t, "music") == 0)
             return "audio";
@@ -190,8 +190,8 @@
     devinfo s;
     s.index = s.device_index = i->index;
     s.name = QString(i->name).replace(' ', '_');
-    s.description = i->description;
-    s.icon_name = pa_proplist_gets(i->proplist, PA_PROP_DEVICE_ICON_NAME);
+    s.description = QString::fromUtf8(i->description);
+    s.icon_name = QString::fromUtf8(pa_proplist_gets(i->proplist, PA_PROP_DEVICE_ICON_NAME));
     s.volume = i->volume;
     s.channel_map = i->channel_map;
     s.mute = !!i->mute;
@@ -243,8 +243,8 @@
     devinfo s;
     s.index = s.device_index = i->index;
     s.name = QString(i->name).replace(' ', '_');
-    s.description = i->description;
-    s.icon_name = pa_proplist_gets(i->proplist, PA_PROP_DEVICE_ICON_NAME);
+    s.description = QString::fromUtf8(i->description);
+    s.icon_name = QString::fromUtf8(pa_proplist_gets(i->proplist, PA_PROP_DEVICE_ICON_NAME));
     s.volume = i->volume;
     s.channel_map = i->channel_map;
     s.mute = !!i->mute;
@@ -284,8 +284,8 @@
         return;
     }
 
-    clients[i->index] = i->name;
-    kDebug(67100) << "Got some info about client: " << i->name;
+    clients[i->index] = QString::fromUtf8(i->name);
+    kDebug(67100) << "Got some info about client: " << clients[i->index];
 }
 
 static void sink_input_cb(pa_context *c, const pa_sink_input_info *i, int eol, void *) {
@@ -320,7 +320,7 @@
     devinfo s;
     s.index = i->index;
     s.device_index = i->sink;
-    s.description = prefix + i->name;
+    s.description = prefix + QString::fromUtf8(i->name);
     s.name = QString("stream:") + i->index;
     s.icon_name = getIconNameFromProplist(i->proplist);
     s.volume = i->volume;
@@ -377,7 +377,7 @@
     devinfo s;
     s.index = i->index;
     s.device_index = i->source;
-    s.description = prefix + i->name;
+    s.description = prefix + QString::fromUtf8(i->name);
     s.name = QString("stream:") + i->index;
     s.icon_name = getIconNameFromProplist(i->proplist);
     //s.volume = i->volume;
[prev in list] [next in list] [prev in thread] [next in thread]