Changeset 39407

Timestamp:

12/03/16 17:16:07 (6 years ago)

Author:

gost

Message:

[titan] qick switch passthrough

Location:

titan/titan

Files:

• audiotrack.h (modified) (5 diffs)
• global.h (modified) (1 diff)

titan/titan/audiotrack.h

@@ -24 +24 @@
         struct skin* audiotrack = getscreen("audiotrack");
         struct skin* listbox = getscreennode(audiotrack, "listbox");
+        struct skin* b4 = getscreennode(audiotrack, "b4");
         struct skin* tmp = NULL;
         struct audiotrack* node = NULL;
@@ -34 +35 @@
                 m_lock(&status.audiotrackmutex, 7);
                 node = status.aktservice->channel->audiotrack;
-                if(getconfigint("downmixinaudio", NULL) == 1)
-                {
-                        tmp = addlistbox(audiotrack, listbox, tmp, 1);
-                        if(tmp != NULL)
-                        {
-                                if(status.downmix == 1)
-                                        changetext(tmp, _("DOWNMIX OFF"));
-                                else
-                                        changetext(tmp, _("DOWNMIX ON"));
-                                tmp->type = CHOICEBOX;
-                                tmp->del = 1;
-                                tmp->handle = (char*)node;
-                                changeinput(tmp, "");
-                        }
-                }
+
                 while(node != NULL)
                 {
@@ -66 +53 @@
                                 else
                                         changeinput(tmp, "");
-                                if(getconfigint("downmixinaudio", NULL) == 0)
-                                        if(treffer == 0) listbox->aktline++;
                         }
                         node = node->next;
@@ -75 +60 @@
 
         if(treffer == 0) listbox->aktline = 1;
+                
+        if(status.downmix == 1)
+                changetext(b4, "passthrough");
+        else
+                changetext(b4, getconfig("av_ac3mode", NULL));
 
         drawscreen(audiotrack, 0, 0);
@@ -101 +91 @@
                         break;
                 }
+                if(rcret == getrcconfigint("rcblue", NULL))
+                {
+                        char* ac3dev = NULL;
+                        ac3dev = getconfig("ac3dev", NULL);
+                        int ret = 0;
+                        if(ac3dev != NULL)
+                        {
+                                if(status.downmix == 1)
+                                {
+                                        ret = writesys(ac3dev, "passthrough", 0);
+                                        if(ret == 0)
+                                                status.downmix = 0; 
+                                        else
+                                                printf("ERROR: set AC3_mode to passthrough\n");
+                                }
+                                else
+                                {
+                                        ret = writesys(ac3dev, getconfig("av_ac3mode", NULL), 0);
+                                        if(ret == 0)
+                                                status.downmix = 1;
+                                        else
+                                                printf("ERROR: set AC3_mode to %s\n", getconfig("av_ac3mode", NULL)); 
+                                }
+                        }
+                        break;
+                }
         }
 

titan/titan/global.h

@@ -3905 +3905 @@
                 ret = writesys(ac3dev, value, 0);
                 if(ret == 0) addconfig("av_ac3mode", value);
+                if(ostrcmp(value, "passthrough") == 0)
+                        status.downmix = 0;
+                else
+                        status.downmix = 1;
                 return ret;
         }