Changeset 32890

Timestamp:

02/06/15 19:25:55 (8 years ago)

Author:

obi

Message:

mipsel hid aspect on avsettings not needed anymore and write av_policy with src value

Location:

titan/titan

Files:

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

titan/titan/avsettings.h

@@ -110 +110 @@
         setchoiceboxselection(aspect, ret);
         free(ret); ret = NULL;
+
+#ifdef MIPSEL
+        aspect->hidden = YES;
+#endif
 
         ret = getcolorformat(2);
@@ -324 +328 @@
                                 free(ret); ret = NULL;
                         }
+#ifndef MIPSEL
                         if(aspect->ret != NULL)
                         {
@@ -331 +336 @@
                                 free(ret); ret = NULL;
                         }
+#endif
                         if(colformat->ret != NULL)
                         {

titan/titan/global.h

@@ -4046 +4046 @@
 int setpolicy(char* value)
 {
-        char* policydev, *tmpstr = NULL;
+        char* policydev, *tmpstr = NULL, *tmpstr2 = NULL;
         int ret = 0;
 
@@ -4054 +4054 @@
         {
                 debug(10, "set %s to %s", policydev, value);
-                tmpstr = ostrcat(value, NULL, 0, 0);
 
 #ifdef MIPSEL
-                if(ostrcmp(_("16:9_set_bestfit_to_policy_show_justscale"), tmpstr) == 0)
-                {
-                        free(tmpstr), tmpstr = NULL;
+                if(ostrcmp(_("16:9_set_bestfit_to_policy_show_justscale"), _(value)) == 0)
+                {
                         tmpstr = ostrcat("bestfit", NULL, 0, 0);
+                        tmpstr2 = ostrcat("16:9_set_bestfit_to_policy_show_justscale", NULL, 0, 0);
                         setaspect("set_16:9");
                 }
-                else if(ostrcmp(_("16:9_set_letterbox_to_policy_show_panscan"), tmpstr) == 0)
-                {
-                        free(tmpstr), tmpstr = NULL;
+                else if(ostrcmp(_("16:9_set_letterbox_to_policy_show_panscan"), _(value)) == 0)
+                {
                         tmpstr = ostrcat("letterbox", NULL, 0, 0);
+                        tmpstr2 = ostrcat("16:9_set_letterbox_to_policy_show_panscan", NULL, 0, 0);
                         setaspect("set_16:9");
                 }
-                else if(ostrcmp(_("16:9_set_panscan_to_policy_show_pillarbox"), tmpstr) == 0)
-                {
-                        free(tmpstr), tmpstr = NULL;
+                else if(ostrcmp(_("16:9_set_panscan_to_policy_show_pillarbox"), _(value)) == 0)
+                {
                         tmpstr = ostrcat("panscan", NULL, 0, 0);
+                        tmpstr2 = ostrcat("16:9_set_panscan_to_policy_show_pillarbox", NULL, 0, 0);
                         setaspect("set_16:9");
                 }                       
-                else if(ostrcmp(_("4:3_set_bestfit_to_policy2_show_justscale"), tmpstr) == 0)
+                else if(ostrcmp(_("4:3_set_bestfit_to_policy2_show_justscale"), _(value)) == 0)
                 {
                         policydev = getconfig("policy2dev", NULL);
-                        free(tmpstr), tmpstr = NULL;
                         tmpstr = ostrcat("bestfit", NULL, 0, 0);
+                        tmpstr2 = ostrcat("4:3_set_bestfit_to_policy2_show_justscale", NULL, 0, 0);
                         setaspect("set_4:3");
                 }
-                else if(ostrcmp(_("4:3_set_letterbox_to_policy2_show_letterbox"), tmpstr) == 0)
+                else if(ostrcmp(_("4:3_set_letterbox_to_policy2_show_letterbox"), _(value)) == 0)
                 {
                         policydev = getconfig("policy2dev", NULL);
-                        free(tmpstr), tmpstr = NULL;
                         tmpstr = ostrcat("letterbox", NULL, 0, 0);
+                        tmpstr2 = ostrcat("4:3_set_letterbox_to_policy2_show_letterbox", NULL, 0, 0);
                         setaspect("set_4:3");
                 }
-                else if(ostrcmp(_("4:3_set_panscan_to_policy2_show_panscan"), tmpstr) == 0)
+                else if(ostrcmp(_("4:3_set_panscan_to_policy2_show_panscan"), _(value)) == 0)
                 {
                         policydev = getconfig("policy2dev", NULL);
-                        free(tmpstr), tmpstr = NULL;
                         tmpstr = ostrcat("panscan", NULL, 0, 0);
+                        tmpstr2 = ostrcat("4:3_set_panscan_to_policy2_show_panscan", NULL, 0, 0);
                         setaspect("set_4:3");
                 }
+#else
+                tmpstr = ostrcat(value, NULL, 0, 0);
 #endif
                 debug(10, "set change %s to %s", policydev, tmpstr);
                 ret = writesys(policydev, tmpstr, 0);
 
+#ifdef MIPSEL
+                if(ret == 0) addconfig("av_policy", tmpstr2);
+#else
                 if(ret == 0) addconfig("av_policy", value);
-
-                free(tmpstr), tmpstr = NULL;
-                return ret;
-        }
-
-        return 0;
+#endif
+        }
+
+        free(tmpstr), tmpstr = NULL;
+        free(tmpstr2), tmpstr2 = NULL;
+        return ret;
 }