[ekiga] [windows] Fix encoding for video device name



commit 8f6c70e5b0dd76255bfebe83221e2d2b73790c54
Author: Eugen Dedu <Eugen Dedu pu-pm univ-fcomte fr>
Date:   Wed Mar 20 13:17:58 2013 +0100

    [windows] Fix encoding for video device name

 .../components/ptlib/videoinput-manager-ptlib.cpp  |   11 +----------
 1 files changed, 1 insertions(+), 10 deletions(-)
---
diff --git a/lib/engine/components/ptlib/videoinput-manager-ptlib.cpp 
b/lib/engine/components/ptlib/videoinput-manager-ptlib.cpp
index 01a165f..f56617c 100644
--- a/lib/engine/components/ptlib/videoinput-manager-ptlib.cpp
+++ b/lib/engine/components/ptlib/videoinput-manager-ptlib.cpp
@@ -78,13 +78,8 @@ void GMVideoInputManager_ptlib::get_devices(std::vector <Ekiga::VideoInputDevice
       devices_array = video_devices.ToCharArray ();
 
       for (PINDEX j = 0; devices_array[j] != NULL; j++) {
-
-#ifdef WIN32
-        /* Windows uses codepage encoding for device name, while ekiga uses utf-8 */
-        device.name = codepage2utf (devices_array[j]);
-#else
+        // ptlib returns device name in utf-8
         device.name = devices_array[j];
-#endif
         devices.push_back(device);
       }
       free (devices_array);
@@ -121,11 +116,7 @@ bool GMVideoInputManager_ptlib::open (unsigned width, unsigned height, unsigned
 
   pvideo_format = (PVideoDevice::VideoFormat)current_state.format;
   input_device = PVideoInputDevice::CreateOpenedDevice (current_state.device.source,
-#ifdef WIN32
-                 utf2codepage (current_state.device.name),  // reencode back to codepage
-#else
                  current_state.device.name,
-#endif
                  FALSE);
 
   Ekiga::VideoInputErrorCodes error_code = Ekiga::VI_ERROR_NONE;


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]