Changeset 18890

Timestamp:

09/05/08 15:08:46 (4 months ago)

Author:

mattn

Message:

デフォルトで検知するデバイス(WALKMANマウント先)を指定出来る様修正

Location:

lang/c/sonydb

Files:

• frontend.cpp (modified) (2 diffs)
• sonydb.cpp (modified) (1 diff)

lang/c/sonydb/frontend.cpp

@@ -745 +745 @@
         gtk_init(&argc, &argv);
 
-        detected = sonydb.detectPlayer();
+        char* playerPath = getenv("SONYDB_PLAYERPATH");
+        if (playerPath != NULL) {
+                if (!sonydb.detectPlayer(playerPath)) {
+                        argc = 0;
+                }
+        } else {
+                if (!sonydb.detectPlayer()) {
+                        argc = 0;
+                }
+        }
 
         window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
@@ -862 +871 @@
         SonyDb sonydb;
 
-        if (!sonydb.detectPlayer()) {
-                argc = 0;
+        char* playerPath = getenv("SONYDB_PLAYERPATH");
+        if (playerPath != NULL) {
+                if (!sonydb.detectPlayer(playerPath)) {
+                        argc = 0;
+                }
+        } else {
+                if (!sonydb.detectPlayer()) {
+                        argc = 0;
+                }
         }
 

lang/c/sonydb/sonydb.cpp

@@ -2658 +2658 @@
                 "/media/usbdisk",
                 "/media/usbdisk1",
+                "/media/WALKMAN",
                 NULL
         };