Changeset 32205

Timestamp:

01/08/15 10:23:54 (8 years ago)

Author:

obi

Message:

mipsel add avsettings wss support

Location:

titan/titan

Files:

• avsettings.h (modified) (3 diffs)
• global.h (modified) (3 diffs)

titan/titan/avsettings.h

@@ -24 +24 @@
         struct skin* ac3mode = getscreennode(avsettings, "ac3mode");
         struct skin* aacmode = getscreennode(avsettings, "aacmode");
+        struct skin* wssmode = getscreennode(avsettings, "wssmode");
         struct skin* volautochangevalue = getscreennode(avsettings, "volautochangevalue");
         struct skin* mode3d = getscreennode(avsettings, "mode3d");
@@ -174 +175 @@
 #ifdef SH4
                 aacmode->hidden = YES;
+#endif
+
+        ret = getwsschoices();
+        changeinput(wssmode, ret);
+        free(ret); ret = NULL;
+        ret = getwss();
+        setchoiceboxselection(wssmode, ret);
+        free(ret); ret = NULL;
+
+#ifdef SH4
+                wssmode->hidden = YES;
 #endif
         
@@ -356 +368 @@
                                 free(ret); ret = NULL;
                         }
+                        if(wssmode->ret != NULL)
+                        {
+                                ret = getwss();
+                                if(ostrcmp(ret, wssmode->ret) != 0)
+                                        setaac(wssmode->ret); 
+                                free(ret); ret = NULL;
+                        }
                         if(mode3d->ret != NULL)
                         {

titan/titan/global.h

@@ -3575 +3575 @@
 }
 
+char* getwsschoices()
+{
+        char *wsschoicesdev = NULL;
+        char *value = NULL;
+
+        wsschoicesdev = getconfig("wsschoicesdev", NULL);
+
+        if(wsschoicesdev == NULL)
+        {
+                err("NULL detect");
+                return NULL;
+        }
+
+        value = readsys(wsschoicesdev, 1);
+        if(value == NULL)
+        {
+                err("NULL detect");
+                return NULL;
+        }
+
+        value = convertspacetolf(value);
+
+        return value;
+}
+
 int setciclock(int slotnr, char* value)
 {
@@ -3734 +3759 @@
 }
 
+int setwss(char* value)
+{
+        char* wssdev = NULL;
+        int ret = 0;
+
+        wssdev = getconfig("wssdev", NULL);
+
+        if(wssdev != NULL && value != NULL)
+        {
+                debug(100, "set %s to %s", wssdev, value);
+                ret = writesys(wssdev, value, 0);
+                if(ret == 0) addconfig("av_wssmode", value);
+                return ret;
+        }
+
+        return 0;
+}
+
 char* getac3()
 {
@@ -3771 +3814 @@
 
         value = readsys(aacdev, 1);
+        if(value == NULL)
+        {
+                err("NULL detect");
+                return NULL;
+        }
+
+        return value;
+}
+
+char* getwss()
+{
+        char *wssdev = NULL;
+        char *value = NULL;
+
+        wssdev = getconfig("wssdev", NULL);
+
+        if(wssdev == NULL)
+        {
+                err("NULL detect");
+                return NULL;
+        }
+
+        value = readsys(wssdev, 1);
         if(value == NULL)
         {