Changeset 61a056a7eb4b1190384432f31ba63d102e8d0230

Timestamp:

03/20/08 21:20:36 (6 months ago)

Author:

André Weber <atmo@videolan.org>

git-committer:

André Weber <atmo@videolan.org> 1206044436 +0100

git-parent:

[bd2b3483d842cb04398d19a5d9b31ceca0e5c26e]

git-author:

André Weber <atmo@videolan.org> 1206044268 +0100

Message:

Fix the handling of string variable - store them as UTF-8 into the config variables, also convert the StringList? values to an UTF8 string before putting them into a QVariant - which seems not to work if created from a "char *" - because later converterd QVariant->toString() isn't UTF8 like expected.
waveout.c forgott to convert string to UTF8 before storing in choice list

Files:

• modules/audio_output/waveout.c (modified) (2 diffs)
• modules/gui/qt4/components/preferences_widgets.cpp (modified) (3 diffs)

modules/audio_output/waveout.c

@@ -1194 +1194 @@
-           == MMSYSERR_NOERROR)
-        {
-sz_dev_name,psz_device_name_fmt,
+ sz_dev_name, psz_device_name_fmt, 
-                                               caps.wMid,
-                                               caps.wPid
-                                              );
-strd
+FromLocaleD
-          p_item->ppsz_list_text[j] = FromLocaleDup( sz_dev_name );
-          p_item->i_list++;
@@ -1233 +1233 @@
-           == MMSYSERR_NOERROR)
-        {
-psz_device_name_fmt,
+ psz_device_name_fmt, 
-                                               caps.wMid,
-                                               caps.wPid
-                                              );
-
-
+
+
+
+
+
+
+
+
-        }
-    }

modules/gui/qt4/components/preferences_widgets.cpp

@@ -185 +185 @@
-                            qobject_cast<VStringConfigControl *>(this);
-            assert( vscc );
-a
+u
-            break;
-        }
@@ -382 +382 @@
-       p_module_config->pf_update_list(p_this, p_item->psz_name, val, val, NULL);
-
-×
+n
-       // because lazy programmes will use the same callback for
-       // this, like the one behind the refresh push button?
@@ -467 +467 @@
-                            p_module_config->ppsz_list_text[i_index] :
-                            p_module_config->ppsz_list[i_index] ),
-     QVariant( p_module_config->ppsz_list[i_index] 
+QVariant( qfu(p_module_config->ppsz_list[i_index] )
-        if( p_item->value.psz && !strcmp( p_module_config->value.psz,
-                                          p_module_config->ppsz_list[i_index] ) )