Changeset 23976

Timestamp:

09/28/13 21:15:36 (10 years ago)

Author:

nit

Message:

[titan] fix colorformat

Location:

titan/titan

Files:

• avsettings.h (modified) (2 diffs)
• global.h (modified) (4 diffs)
• titan.c (modified) (1 diff)

titan/titan/avsettings.h

@@ -287 +287 @@
                         if(colformat->ret != NULL)
                         {
-                                setcolorformat(colformat->ret); 
+                                setcolorformat(colformat->ret, 0); 
                                 ret = getcolorformat(1);
                                 changeinput(colformat, ret);
@@ -295 +295 @@
                         if(colformatscart->ret != NULL)
                         {
-                                setcolorformat(colformatscart->ret); 
+                                setcolorformat(colformatscart->ret, 1); 
                                 ret = getcolorformat(2);
                                 changeinput(colformatscart, ret);

titan/titan/global.h

@@ -2177 +2177 @@
                 setvideomode("720p50", 0);
                 changefbresolution("720p50", 0);
-                setcolorformat("hdmi_rgb");
+                setcolorformat("hdmi_rgb", 0);
         }
         else
@@ -2183 +2183 @@
                 setvideomode("576i50", 0);
                 changefbresolution("576i50", 0);
-                setcolorformat("rgb");
+                setcolorformat("rgb", 1);
         }
 
@@ -4863 +4863 @@
 }
 
-int setcolorformat(char* value)
+//flag 0 = hdmi
+//flag 1 = scart
+int setcolorformat(char* value, int flag)
 {
         char* colorformatdev;
@@ -4874 +4876 @@
                 debug(100, "set %s to %s", colorformatdev, value);
                 ret = writesys(colorformatdev, value, 0);
-                if(ret == 0) addconfig("av_colorformat", value);
+                if(ret == 0)
+                {
+                        if(flag == 0)
+                                addconfig("av_colorformat", value);
+                        else
+                                addconfig("av_colorformatscart", value);
+                }
                 return ret;
         }

titan/titan/titan.c

@@ -570 +570 @@
         ret = setpolicy(getconfig("av_policy", NULL));
         ret = setaspect(getconfig("av_aspect", NULL));
-        ret = setcolorformat(getconfig("av_colorformat", NULL));
+        ret = setcolorformat(getconfig("av_colorformat", NULL), 0);
+        ret = setcolorformat(getconfig("av_colorformatscart", NULL), 1);
         ret = setaudiosource(getconfig("av_audiosource", NULL));
         ret = setac3(getconfig("av_ac3mode", NULL));