[longomatch] List OS X devices properly



commit 3743391b26a4e94cfbe9261bd3f2989e90101e41
Author: Andoni Morales Alastruey <ylatuya gmail com>
Date:   Wed Oct 3 04:35:57 2012 +0200

    List OS X devices properly

 .../Gui/Component/ProjectDetailsWidget.cs          |   10 +++++-----
 libcesarplayer/common.h                            |    2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)
---
diff --git a/LongoMatch.GUI/Gui/Component/ProjectDetailsWidget.cs b/LongoMatch.GUI/Gui/Component/ProjectDetailsWidget.cs
index 6932b61..b254c9f 100644
--- a/LongoMatch.GUI/Gui/Component/ProjectDetailsWidget.cs
+++ b/LongoMatch.GUI/Gui/Component/ProjectDetailsWidget.cs
@@ -345,15 +345,15 @@ namespace LongoMatch.Gui.Component
 			foreach(Device device in devices) {
 				string deviceElement;
 				string deviceName;
-				if(Environment.OSVersion.Platform == PlatformID.Unix) {
+				if(Environment.OSVersion.Platform == PlatformID.MacOSX) {
+					deviceElement = Catalog.GetString("OS X Source");
+				} else if (Environment.OSVersion.Platform == PlatformID.Win32NT) {
+					deviceElement = Catalog.GetString("DirectShow Source");
+				} else {
 					if(device.DeviceType == CaptureSourceType.DV)
 						deviceElement = Catalog.GetString(DV_SOURCE);
 					else
 						deviceElement = Catalog.GetString(GCONF_SOURCE);
-				} else if (Environment.OSVersion.Platform == PlatformID.Win32NT) {
-					deviceElement = Catalog.GetString("DirectShow Source");
-				} else {
-					deviceElement = Catalog.GetString("OS X Source");
 				}
 				deviceName = (device.ID == "") ? Catalog.GetString("Unknown"): device.ID;
 				devicecombobox.AppendText(deviceName + " ("+deviceElement+")");
diff --git a/libcesarplayer/common.h b/libcesarplayer/common.h
index 4c9ada2..48a73e1 100644
--- a/libcesarplayer/common.h
+++ b/libcesarplayer/common.h
@@ -38,7 +38,7 @@
 #define SYSVIDEOSRC "dshowvideosrc"
 #define AUDIOSRC "dshowaudiosrc"
 #elif defined(OSTYPE_OS_X)
-#define DVVIDEOSRC "dv1394src"
+#define DVVIDEOSRC "osxvideosrc"
 #define SYSVIDEOSRC "osxvideosrc"
 #define AUDIOSRC "osxaudiosrc"
 #elif defined(OSTYPE_LINUX)



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