Changeset 39947 for titan

Timestamp:

02/08/17 19:50:33 (7 years ago)

Author:

gost

Message:

[titan] dm900 activate new audio settings.. step 1

Location:

titan/titan

Files:

• avsettings.h (modified) (3 diffs)
• global.h (modified) (6 diffs)
• titan.c (modified) (1 diff)

titan/titan/avsettings.h

@@ -24 +24 @@
         struct skin* ac3mode = getscreennode(avsettings, "ac3mode");
         struct skin* aacmode = getscreennode(avsettings, "aacmode");
+        struct skin* ac3plusmode = getscreennode(avsettings, "ac3plusmode");
+        struct skin* dtshdmode = getscreennode(avsettings, "dtshdmode");
+        struct skin* wmapromode = getscreennode(avsettings, "wmapromode");
         struct skin* wssmode = getscreennode(avsettings, "wssmode");
         struct skin* volautochangevalue = getscreennode(avsettings, "volautochangevalue");
@@ -177 +180 @@
         setchoiceboxselection(aacmode, ret);
         free(ret); ret = NULL;
-
+        
+        if(checkbox("DM900") == 1 && ac3plusmode != NULL)
+        {
+                ac3plusmode->hidden = NO;
+                dtshdmode->hidden = NO;
+                wmapromode->hidden = NO;
+                
+                ret = getac3pluschoices();
+                changeinput(ac3plusmode, ret);
+                free(ret); ret = NULL;
+                ret = getac3plus();
+                setchoiceboxselection(ac3plusmode, ret);
+                free(ret); ret = NULL;
+                
+                ret = getdtshdchoices();
+                changeinput(dtshdmode, ret);
+                free(ret); ret = NULL;
+                ret = getdtshd();
+                setchoiceboxselection(dtshdmode, ret);
+                free(ret); ret = NULL;
+                
+                ret = getwmaprochoices();
+                changeinput(wmapromode, ret);
+                free(ret); ret = NULL;
+                ret = getwmapro();
+                setchoiceboxselection(wmapromode, ret);
+                free(ret); ret = NULL;
+        }
+        else
+        {
+                ac3plusmode->hidden = YES;
+                dtshdmode->hidden = YES;
+                wmapromode->hidden = YES;
+        }
 #ifdef SH4
                 aacmode->hidden = YES;
 #endif
 
+        
         ret = getwsschoices();
         changeinput(wssmode, ret);
@@ -418 +455 @@
                                 free(ret); ret = NULL;
                         }
+                        if(ac3plusmode->ret != NULL)
+                        {
+                                ret = getac3plus();
+                                if(ostrcmp(ret, ac3plusmode->ret) != 0)
+                                        setaac(ac3plusmode->ret); 
+                                free(ret); ret = NULL;
+                        }
+                        if(dtshdmode->ret != NULL)
+                        {
+                                ret = getdtshd();
+                                if(ostrcmp(ret, dtshdmode->ret) != 0)
+                                        setaac(dtshdmode->ret); 
+                                free(ret); ret = NULL;
+                        }
+                        if(wmapromode->ret != NULL)
+                        {
+                                ret = getwmapro();
+                                if(ostrcmp(ret, wmapromode->ret) != 0)
+                                        setaac(wmapromode->ret); 
+                                free(ret); ret = NULL;
+                        }
                         if(wssmode->ret != NULL)
                         {

titan/titan/global.h

@@ -3704 +3704 @@
         if(ac3pluschoicesdev == NULL)
         {
-                err("NULL detect");
-                return NULL;
+                addconfig("ac3pluschoicesdev", "/proc/stb/audio/ac3plus_choices");
+                ac3pluschoicesdev = getconfig("ac3pluschoicesdev", NULL);
         }
 
@@ -3729 +3729 @@
         if(dtshdchoicesdev == NULL)
         {
-                err("NULL detect");
-                return NULL;
+                addconfig("dtshdchoicesdev", "/proc/stb/audio/dtshd_choices");
+                dtshdchoicesdev = getconfig("dtshdchoicesdev", NULL);
         }
 
@@ -3754 +3754 @@
         if(wmaprochoicesdev == NULL)
         {
-                err("NULL detect");
-                return NULL;
+                addconfig("wmaprochoicesdev", "/proc/stb/audio/wmapro_choices");
+                wmaprochoicesdev = getconfig("wmaprochoicesdev", NULL);
         }
 
@@ -3974 +3974 @@
 
         ac3plusdev = getconfig("ac3plusdev", NULL);
+        if(ac3plusdev == NULL)
+        {       
+                addconfig("ac3plusdev", "/proc/stb/audio/ac3plus");
+                ac3plusdev = getconfig("ac3plusdev", NULL);
+        }
 
         if(ac3plusdev != NULL && value != NULL)
@@ -3992 +3997 @@
 
         dtshddev = getconfig("dtshddev", NULL);
+        if(dtshddev == NULL)
+        {       
+                addconfig("dtshddev", "/proc/stb/audio/dtshd");
+                dtshddev = getconfig("dtshddev", NULL);
+        }
 
         if(dtshddev != NULL && value != NULL)
@@ -4010 +4020 @@
 
         wmaprodev = getconfig("wmaprodev", NULL);
+        if(wmaprodev == NULL)
+        {       
+                addconfig("wmaprodev", "/proc/stb/audio/wmapro");
+                wmaprodev = getconfig("wmaprodev", NULL);
+        }
 
         if(wmaprodev != NULL && value != NULL)

titan/titan/titan.c

@@ -626 +626 @@
         ret = setaudiosource(getconfig("av_audiosource", NULL));
         ret = setac3(getconfig("av_ac3mode", NULL));
+
+        if(checkbox("DM900") == 1)
+        {
+                if(getconfig("av_ac3plusmode", NULL) == NULL)
+                        addconfig("av_ac3plusmode", "use_hdmi_caps");
+                if(getconfig("av_dtshdmode", NULL) == NULL)
+                        addconfig("av_dtshdmode", "use_hdmi_caps");
+                if(getconfig("av_wmapromode", NULL) == NULL)
+                        addconfig("av_wmapromode", "downmix");
+                ret = setac3plus(getconfig("av_ac3plusmode", NULL));
+                ret = setdtshd(getconfig("av_dtshdmode", NULL));
+                ret = setwmapro(getconfig("av_wmapromode", NULL));
+        }
+                
 #ifdef MIPSEL
         ret = setaac(getconfig("av_aacmode", NULL));