Changeset 20621

Timestamp:

03/23/13 02:20:32 (10 years ago)

Author:

nit

Message:

[titan] add audio delay

Location:

titan

Files:

• settings/titan-merge.cfg (modified) (1 diff)
• settings/titan.atemio510.cfg (modified) (1 diff)
• settings/titan.atemio7600.cfg (modified) (1 diff)
• settings/titan.atevio700.cfg (modified) (1 diff)
• settings/titan.atevio7000.cfg (modified) (1 diff)
• settings/titan.cfg (modified) (1 diff)
• titan/avsettings.h (modified) (3 diffs)
• titan/global.h (modified) (1 diff)
• titan/titan.c (modified) (1 diff)

titan/settings/titan-merge.cfg

@@ -1 +1 @@
 debuglevel=10
+audiodelaybitstream=/proc/stb/audio/audio_delay_bitstream
 brightnessdev=/proc/stb/video/plane/psi_brightness
 contrastdev=/proc/stb/video/plane/psi_contrast

titan/settings/titan.atemio510.cfg

@@ -1 +1 @@
 debuglevel=10
+audiodelaybitstream=/proc/stb/audio/audio_delay_bitstream
 sataswitchdev=/proc/sata/sata_switch
 brightnessdev=/proc/stb/video/plane/psi_brightness

titan/settings/titan.atemio7600.cfg

@@ -1 +1 @@
 debuglevel=10
+audiodelaybitstream=/proc/stb/audio/audio_delay_bitstream
 sataswitchdev=/proc/sata/sata_switch
 brightnessdev=/proc/stb/video/plane/psi_brightness

titan/settings/titan.atevio700.cfg

@@ -1 +1 @@
 debuglevel=10
+audiodelaybitstream=/proc/stb/audio/audio_delay_bitstream
 sataswitchdev=/proc/sata/sata_switch
 brightnessdev=/proc/stb/video/plane/psi_brightness

titan/settings/titan.atevio7000.cfg

@@ -1 +1 @@
 debuglevel=10
+audiodelaybitstream=/proc/stb/audio/audio_delay_bitstream
 sataswitchdev=/proc/sata/sata_switch
 brightnessdev=/proc/stb/video/plane/psi_brightness

titan/settings/titan.cfg

@@ -1 +1 @@
 debuglevel=10
+audiodelaybitstream=/proc/stb/audio/audio_delay_bitstream
 sataswitchdev=/proc/sata/sata_switch
 brightnessdev=/proc/stb/video/plane/psi_brightness

titan/titan/avsettings.h

@@ -26 +26 @@
         struct skin* mode3d = getscreennode(avsettings, "mode3d");
         struct skin* autosubtitle = getscreennode(avsettings, "autosubtitle");
+        struct skin* audiodelaybitstream = getscreennode(avsettings, "audiodelaybitstream");
         struct skin* tmp = NULL;
 
@@ -142 +143 @@
         addchoicebox(autosubtitle, "1", _("yes"));
         setchoiceboxselection(autosubtitle, getconfig("autosubtitle", NULL));
+
+        addchoicebox(audiodelaybitstream, "0", _("no"));
+        addchoicebox(audiodelaybitstream, "350", "10ms");
+        addchoicebox(audiodelaybitstream, "700", "20ms");
+        addchoicebox(audiodelaybitstream, "1050", "30ms");
+        addchoicebox(audiodelaybitstream, "1400", "40ms");
+        addchoicebox(audiodelaybitstream, "1750", "50ms");
+        addchoicebox(audiodelaybitstream, "2100", "60ms");
+        addchoicebox(audiodelaybitstream, "2450", "70ms");
+        addchoicebox(audiodelaybitstream, "2800", "80ms");
+        addchoicebox(audiodelaybitstream, "3150", "90ms");
+        addchoicebox(audiodelaybitstream, "3500", "100ms");
+        setchoiceboxselection(audiodelaybitstream, getconfig("audiodelaybitstream", NULL));
 
         drawscreen(avsettings, 0, 0);
@@ -281 +295 @@
                                 free(ret); ret = NULL;
                         }
+                        if(audiodelaybitstream->ret != NULL)
+                        {
+                                ret = getaudiodelaybitstream();
+                                if(ostrcmp(ret, audiodelaybitstream->ret) != 0)
+                                        setaudiodelaybitstream(audiodelaybitstream->ret);
+                                free(ret); ret = NULL;
+                        }
+
                         addconfigscreencheck("volautochangevalue", volautochangevalue, 0);
                         status.volautochangevalue = getconfigint("volautochangevalue", NULL);

titan/titan/global.h

@@ -4294 +4294 @@
 }
 
+int setaudiodelaybitstream(char* value)
+{
+        debug(1000, "in");
+        char* audiodelaybitstreamdev = NULL;
+        int ret = 0;
+
+        audiodelaybitstreamdev = getconfig("audiodelaybitstreamdev", NULL);
+
+        if(audiodelaybitstreamdev != NULL && value != NULL)
+        {
+                debug(100, "set %s to %s", audiodelaybitstreamdev, value);
+                ret = writesys(audiodelaybitstreamdev, value, 0);
+                if(ret == 0) addconfig("audiodelaybitstream", value);
+                return ret;
+        }
+
+        debug(1000, "out");
+        return 0;
+}
+
+char* getaudiodelaybitstream()
+{
+        debug(1000, "in");
+        char *audiodelaybitstreamdev = NULL;
+        char *value = NULL;
+
+        audiodelaybitstreamdev = getconfig("audiodelaybitstreamdev", NULL);
+
+        if(audiodelaybitstreamdev == NULL)
+        {
+                debug(1000, "out -> NULL detect");
+                return NULL;
+        }
+
+        value = readsys(audiodelaybitstreamdev, 1);
+        if(value == NULL)
+        {
+                debug(1000, "out -> NULL detect");
+                return NULL;
+        }
+
+        debug(1000, "out");
+        return value;
+}
+
 char* getpolicychoices()
 {

titan/titan/titan.c

@@ -562 +562 @@
         ret = setmode3d(getconfig("av_mode3d", NULL));
         ret = setvfdbrightness(getconfigint("vfdbrightness", NULL));
+        ret = setaudiodelaybitstream(getconfigint("audiodelaybitstream", NULL));
         ret = addinetworkall(NULL);