X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?p=openpandora.oe.git;a=blobdiff_plain;f=recipes%2Fpandora-system%2Fpandora-scripts%2Fop_tvout.sh;h=b10f748a2593761da683b7f007a183b053bdb9e9;hp=5ff2d539a0bf2d56ef3ff7960c908db3774ac8a3;hb=90222b309b7707b9ba83554f7f08d4017dd37de5;hpb=582f63c62e082b266d47cb80c3dbacd824752cda

diff --git a/recipes/pandora-system/pandora-scripts/op_tvout.sh b/recipes/pandora-system/pandora-scripts/op_tvout.sh
index 5ff2d53..b10f748 100755
--- 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
@@ -90,7 +96,11 @@ while true; do
       ;;
     "-ps")
       shift
-      pal_size=$1
+      if [ "$1" != "0,0" ]; then
+        pal_size=$1
+      else
+        echo "warning: ignored pal_size: $1"
+      fi
       ;;
     "-pp")
       shift
@@ -98,7 +108,11 @@ while true; do
       ;;
     "-ns")
       shift
-      ntsc_size=$1
+      if [ "$1" != "0,0" ]; then
+        ntsc_size=$1
+      else
+        echo "warning: ignored ntsc_size: $1"
+      fi
       ;;
     "-np")
       shift
@@ -127,11 +141,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 +164,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 +172,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 +180,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 +188,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 +196,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 +204,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 +212,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 +220,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