op_tvout.sh: fix NTSC breakage

diff --git a/recipes/pandora-system/pandora-scripts.bb b/recipes/pandora-system/pandora-scripts.bb
index 10dc789..561bd42 100644 (file)
--- a/recipes/pandora-system/pandora-scripts.bb
+++ b/recipes/pandora-system/pandora-scripts.bb
@@ -6,7 +6,7 @@ COMPATIBLE_MACHINE = "omap3-pandora"
 DEPENDS = "zenity dbus"
 RDEPENDS = "zenity dbus"
 
-PR = "r72"
+PR = "r73"
 
 SRC_URI = " \
           file://op_bright.sh \

diff --git a/recipes/pandora-system/pandora-scripts/op_tvout.sh b/recipes/pandora-system/pandora-scripts/op_tvout.sh
index 5ff2d53..65a6556 100755 (executable)
--- a/recipes/pandora-system/pandora-scripts/op_tvout.sh
+++ b/recipes/pandora-system/pandora-scripts/op_tvout.sh
@@ -8,8 +8,6 @@ pal_size="658,520"
 pal_pos="35,35"
 ntsc_size="655,455"
 ntsc_pos="40,15"
-size=$pal_size
-pos=$pal_pos
 
 usage()
 {
@@ -27,8 +25,16 @@ setup_scaler()
 
 enable_it()
 {
-  echo "${tv_type}, ${conn_type}, layer $layer $pos $size"
+  size=$pal_size
+  pos=$pal_pos
+  if [ "$tv_type" = "ntsc" ]; then
+    size=$ntsc_size
+    pos=$ntsc_pos
+  fi
+  echo "${tv_type}, ${conn_type}, layer $layer, $pos $size"
+
   cd /sys/devices/platform/omapdss
+  echo 0 > display1/enabled
   echo 0 > overlay0/enabled
   echo 0 > overlay1/enabled
   echo 0 > overlay2/enabled
@@ -45,9 +51,9 @@ enable_it()
   fi
   echo $conn_type > display1/venc_type
   echo "tv" > overlay2/manager
+  echo $tv_type > display1/timings
   echo $size > overlay2/output_size
   echo $pos > overlay2/position 
-  echo $tv_type > display1/timings
   echo 1 > overlay0/enabled
   echo 1 > overlay2/enabled
   echo 1 > display1/enabled
@@ -127,11 +133,6 @@ if [ "$layer" != "0" -a "$layer" != "1" ]; then
   usage
 fi
 
-if [ "$tv_type" = "ntsc" ]; then
-  size=$ntsc_size
-  pos=$ntsc_pos
-fi
-
 
 if $got_args; then
   enable_it
@@ -155,8 +156,7 @@ else
   case $mainsel in
     "pal")
     layer=0
-    pos=$pal_pos
-    size=$pal_size
+    tv_type="pal"
     conn_type="composite"
     enable_it
     zenity --info --title="TV Out" --text "TV Out (PAL Mode) has been enabled." --timeout 6
@@ -164,8 +164,7 @@ else
 
     "pal2")
     layer=1
-    pos=$pal_pos
-    size=$pal_size
+    tv_type="pal"
     conn_type="composite"
     enable_it
     zenity --info --title="TV Out" --text "TV Out (PAL Mode) has been enabled." --timeout 6
@@ -173,8 +172,7 @@ else
 
     "ntsc")
     layer=0
-    pos=$ntsc_pos
-    size=$ntsc_size
+    tv_type="ntsc"
     conn_type="composite"
     enable_it
     zenity --info --title="TV Out" --text "TV Out (NTSC Mode) has been enabled." --timeout 6  
@@ -182,8 +180,7 @@ else
 
     "ntsc2")
     layer=1
-    pos=$ntsc_pos
-    size=$ntsc_size
+    tv_type="ntsc"
     conn_type="composite"
     enable_it
     zenity --info --title="TV Out" --text "TV Out (NTSC Mode) has been enabled." --timeout 6  
@@ -191,8 +188,7 @@ else
 
     "pals")
     layer=0
-    pos=$pal_pos
-    size=$pal_size
+    tv_type="pal"
     conn_type="svideo"
     enable_it
     zenity --info --title="TV Out" --text "TV Out (PAL Mode) has been enabled." --timeout 6
@@ -200,8 +196,7 @@ else
 
     "pal2s")
     layer=1
-    pos=$pal_pos
-    size=$pal_size
+    tv_type="pal"
     conn_type="svideo"
     enable_it
     zenity --info --title="TV Out" --text "TV Out (PAL Mode) has been enabled." --timeout 6
@@ -209,8 +204,7 @@ else
 
     "ntscs")
     layer=0
-    pos=$ntsc_pos
-    size=$ntsc_size
+    tv_type="ntsc"
     conn_type="svideo"
     enable_it
     zenity --info --title="TV Out" --text "TV Out (NTSC Mode) has been enabled." --timeout 6  
@@ -218,8 +212,7 @@ else
 
     "ntsc2s")
     layer=1
-    pos=$ntsc_pos
-    size=$ntsc_size
+    tv_type="ntsc"
     conn_type="svideo"
     enable_it
     zenity --info --title="TV Out" --text "TV Out (NTSC Mode) has been enabled." --timeout 6