Changeset 24522

Timestamp:

10/23/13 16:49:02 (9 years ago)

Author:

obi

Message:

fix gmediarender and add debug for minidlna

Location:

titan/plugins

Files:

• dlna/dlna.h (modified) (2 diffs)
• dlna/dlna.sh (modified) (1 diff)
• gmediarender/gmediarender.h (modified) (2 diffs)

titan/plugins/dlna/dlna.h

@@ -327 +327 @@
                         if(rcret == getrcconfigint("rcgreen", NULL))
                         {
+                                debug(10, "cmd: %s", dlnastop);
                                 system(dlnastop);
+                                debug(10, "cmd: %s", dlnastart);
                                 ret = system(dlnastart);
                                 if(ret == 0)
@@ -339 +341 @@
                 if(rcret == getrcconfigint("rcyellow", NULL))
                 {
+                        debug(10, "cmd: %s", dlnastop);
                         system(dlnastop);
                         textbox(_("Message"), _("DLNA now stopped"), _("OK"), getrcconfigint("rcok", NULL), _("EXIT"), getrcconfigint("rcexit", NULL), NULL, 0, NULL, 0, 600, 200, 10, 0);

titan/plugins/dlna/dlna.sh

@@ -10 +10 @@
 export PATH=$PATH:/var/swap/bin:/mnt/swapextensions/bin:/var/bin
 export LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:/var/swap/lib:/mnt/swapextensions/lib:/var/lib
-        
+
+model=`cat /etc/model`
 NAME=minidlna
-DESC="MiniDLNA"
+DESC="MiniDLNA-$model"
 DAEMON=minidlna
 USER=root

titan/plugins/gmediarender/gmediarender.h

@@ -91 +91 @@
         drawscreen(skin, 0, 0);
 
+        if(file_exist("/var/usr/local/share/titan/plugins/gmediarender/gmediarender.sh") == 1)
+                cmd = ostrcat(cmd, "/var/usr/local/share/titan/plugins/gmediarender/gmediarender.sh gmediarender-", 1, 0);
+        else if(file_exist("/var/swap/usr/local/share/titan/plugins/gmediarender/gmediarender.sh") == 1)
+                cmd = ostrcat(cmd, "/var/swap/usr/local/share/titan/plugins/gmediarender/gmediarender.sh gmediarender-", 1, 0);
+        else
+                cmd = ostrcat(cmd, "/mnt/swapextensions/usr/local/share/titan/plugins/gmediarender/gmediarender.sh gmediarender-", 1, 0);
+        
         cmd = ostrcat(cmd, "/var/usr/local/share/titan/plugins/gmediarender/gmediarender.sh gmediarender-", 1, 0);
         cmd = ostrcat(cmd, status.boxtype, 1, 0);
@@ -96 +103 @@
 
         //start renderer
+        debug(10, "cmd: %s", cmd);
         system(cmd);
         free(cmd), cmd = NULL;