From: Grazvydas Ignotas <notasas@gmail.com>
Date: Fri, 20 Sep 2013 23:53:26 +0000 (+0300)
Subject: op_tvout: clean up
X-Git-Tag: sz_160~48
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?p=openpandora.oe.git;a=commitdiff_plain;h=357ddc68cc311197c905da90b28ab8f8d3caccb2

op_tvout: clean up
---

diff --git a/recipes/pandora-system/pandora-scripts.bb b/recipes/pandora-system/pandora-scripts.bb
index 6feff63..78e9330 100644
--- a/recipes/pandora-system/pandora-scripts.bb
+++ b/recipes/pandora-system/pandora-scripts.bb
@@ -5,7 +5,7 @@ COMPATIBLE_MACHINE = "omap3-pandora"
 
 RDEPENDS = "bash sed gawk grep zenity"
 
-PR = "r146"
+PR = "r147"
 
 SRC_URI = " \
           file://op_paths.sh \
diff --git a/recipes/pandora-system/pandora-scripts/op_tvout.sh b/recipes/pandora-system/pandora-scripts/op_tvout.sh
index ff96e65..1046c20 100755
--- a/recipes/pandora-system/pandora-scripts/op_tvout.sh
+++ b/recipes/pandora-system/pandora-scripts/op_tvout.sh
@@ -152,7 +152,6 @@ if test -f "$profiles"; then
 fi
 
 # parse args
-got_args=false
 while true; do
   case $1 in
     "-d")
@@ -208,7 +207,6 @@ while true; do
   esac
 
   if ! shift; then break; fi
-  got_args=true
 done
 
 if ! is_good_tv_type $tv_type; then
@@ -223,96 +221,4 @@ if ! is_good_layer $layer; then
   usage
 fi
 
-
-if $got_args; then
-  enable_it
-else
-  # old zenity menu, to be removed
-  while mainsel=$(zenity --title="TV-Out Configuration" --width="420" --height="348" --list \
-    --column "id" --column "Please select" --hide-column=1 \
-    --text="This is a very simple TV Out Script. It will be enhanced." \
-    "pal" "Enable TV Out in PAL Mode (Composite)" \
-    "ntsc" "Enable TV Out in NTSC Mode (Composite)" \
-    "pal2" "Enable TV Out in PAL Mode, overlay (Composite)" \
-    "ntsc2" "Enable TV Out in NTSC Mode, overlay (Composite)" \
-    "pals" "Enable TV Out in PAL Mode (SVideo)" \
-    "ntscs" "Enable TV Out in NTSC Mode (SVideo)" \
-    "pal2s" "Enable TV Out in PAL Mode, overlay (SVideo)" \
-    "ntsc2s" "Enable TV Out in NTSC Mode, overlay (SVideo)" \
-    "disable" "Disable TV Out" \
-    )
-  do
-
-  case $mainsel in
-    "pal")
-    layer=0
-    tv_type="pal"
-    conn_type="composite"
-    enable_it
-    zenity --info --title="TV Out" --text "TV Out (PAL Mode) has been enabled." --timeout 6
-    ;;
-
-    "pal2")
-    layer=1
-    tv_type="pal"
-    conn_type="composite"
-    enable_it
-    zenity --info --title="TV Out" --text "TV Out (PAL Mode) has been enabled." --timeout 6
-    ;;
-
-    "ntsc")
-    layer=0
-    tv_type="ntsc"
-    conn_type="composite"
-    enable_it
-    zenity --info --title="TV Out" --text "TV Out (NTSC Mode) has been enabled." --timeout 6  
-    ;;
-
-    "ntsc2")
-    layer=1
-    tv_type="ntsc"
-    conn_type="composite"
-    enable_it
-    zenity --info --title="TV Out" --text "TV Out (NTSC Mode) has been enabled." --timeout 6  
-    ;;
-
-    "pals")
-    layer=0
-    tv_type="pal"
-    conn_type="svideo"
-    enable_it
-    zenity --info --title="TV Out" --text "TV Out (PAL Mode) has been enabled." --timeout 6
-    ;;
-
-    "pal2s")
-    layer=1
-    tv_type="pal"
-    conn_type="svideo"
-    enable_it
-    zenity --info --title="TV Out" --text "TV Out (PAL Mode) has been enabled." --timeout 6
-    ;;
-
-    "ntscs")
-    layer=0
-    tv_type="ntsc"
-    conn_type="svideo"
-    enable_it
-    zenity --info --title="TV Out" --text "TV Out (NTSC Mode) has been enabled." --timeout 6  
-    ;;
-
-    "ntsc2s")
-    layer=1
-    tv_type="ntsc"
-    conn_type="svideo"
-    enable_it
-    zenity --info --title="TV Out" --text "TV Out (NTSC Mode) has been enabled." --timeout 6  
-    ;;
-
-
-    "disable")
-    disable_it
-    zenity --info --title="TV Out" --text "TV Out has been disabled." --timeout 6
-    ;;    
-  esac
-  done
-fi
+enable_it