op_tvout.sh: Quick ugly hack to include composite / svideo in GUI

Bumped libpnd and pandora-scripts-recipe

diff --git a/recipes/pandora-system/pandora-libpnd.bb b/recipes/pandora-system/pandora-libpnd.bb
index d638b48..e26ae61 100755 (executable)
--- a/recipes/pandora-system/pandora-libpnd.bb
+++ b/recipes/pandora-system/pandora-libpnd.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Support for the PND format in Pandora images (lib, daemon, init script etc.)"
 LICENSE = "lGPL"
 
 DESCRIPTION = "Support for the PND format in Pandora images (lib, daemon, init script etc.)"
 LICENSE = "lGPL"
 

-PR = "r53"
+PR = "r54"

 
 PARALLEL_MAKE = ""
 
 
 PARALLEL_MAKE = ""
 


@@ -14,7 +14,7 @@ SRC_URI = " \
           file://op_pnd_run.desktop \
 "
 
           file://op_pnd_run.desktop \
 "
 

-SRCREV = "9c7db6d5e5c0634ae85713fc27fd3bef2ee96827"
+SRCREV = "0d31a3a2601987fa5576c50651f311f4855e8945"

 
 S = "${WORKDIR}/git"
 
 
 S = "${WORKDIR}/git"
 

diff --git a/recipes/pandora-system/pandora-scripts.bb b/recipes/pandora-system/pandora-scripts.bb
index c6d0436..03b2a04 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"
 
 DEPENDS = "zenity dbus"
 RDEPENDS = "zenity dbus"
 

-PR = "r70"
+PR = "r71"

 
 SRC_URI = " \
           file://op_bright.sh \
 
 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 3f64e93..5ff2d53 100755 (executable)
--- a/recipes/pandora-system/pandora-scripts/op_tvout.sh
+++ b/recipes/pandora-system/pandora-scripts/op_tvout.sh
@@ -137,13 +137,17 @@ if $got_args; then
   enable_it
 else
   # old zenity menu, to be removed
   enable_it
 else
   # old zenity menu, to be removed

-  while mainsel=$(zenity --title="TV-Out Configuration" --width="420" --height="248" --list \
+  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." \
     --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" \
-    "ntsc" "Enable TV Out in NTSC Mode" \
-    "pal2" "Enable TV Out in PAL Mode, overlay" \
-    "ntsc2" "Enable TV Out in NTSC Mode, overlay" \
+    "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
     "disable" "Disable TV Out" \
     )
   do


@@ -153,6 +157,7 @@ else
     layer=0
     pos=$pal_pos
     size=$pal_size
     layer=0
     pos=$pal_pos
     size=$pal_size

+    conn_type="composite"

     enable_it
     zenity --info --title="TV Out" --text "TV Out (PAL Mode) has been enabled." --timeout 6
     ;;
     enable_it
     zenity --info --title="TV Out" --text "TV Out (PAL Mode) has been enabled." --timeout 6
     ;;


@@ -161,6 +166,7 @@ else
     layer=1
     pos=$pal_pos
     size=$pal_size
     layer=1
     pos=$pal_pos
     size=$pal_size

+    conn_type="composite"

     enable_it
     zenity --info --title="TV Out" --text "TV Out (PAL Mode) has been enabled." --timeout 6
     ;;
     enable_it
     zenity --info --title="TV Out" --text "TV Out (PAL Mode) has been enabled." --timeout 6
     ;;


@@ -169,6 +175,7 @@ else
     layer=0
     pos=$ntsc_pos
     size=$ntsc_size
     layer=0
     pos=$ntsc_pos
     size=$ntsc_size

+    conn_type="composite"

     enable_it
     zenity --info --title="TV Out" --text "TV Out (NTSC Mode) has been enabled." --timeout 6  
     ;;
     enable_it
     zenity --info --title="TV Out" --text "TV Out (NTSC Mode) has been enabled." --timeout 6  
     ;;


@@ -177,10 +184,48 @@ else
     layer=1
     pos=$ntsc_pos
     size=$ntsc_size
     layer=1
     pos=$ntsc_pos
     size=$ntsc_size

+    conn_type="composite"

     enable_it
     zenity --info --title="TV Out" --text "TV Out (NTSC Mode) has been enabled." --timeout 6  
     ;;
 
     enable_it
     zenity --info --title="TV Out" --text "TV Out (NTSC Mode) has been enabled." --timeout 6  
     ;;
 

+    "pals")
+    layer=0
+    pos=$pal_pos
+    size=$pal_size
+    conn_type="svideo"
+    enable_it
+    zenity --info --title="TV Out" --text "TV Out (PAL Mode) has been enabled." --timeout 6
+    ;;
+
+    "pal2s")
+    layer=1
+    pos=$pal_pos
+    size=$pal_size
+    conn_type="svideo"
+    enable_it
+    zenity --info --title="TV Out" --text "TV Out (PAL Mode) has been enabled." --timeout 6
+    ;;
+
+    "ntscs")
+    layer=0
+    pos=$ntsc_pos
+    size=$ntsc_size
+    conn_type="svideo"
+    enable_it
+    zenity --info --title="TV Out" --text "TV Out (NTSC Mode) has been enabled." --timeout 6  
+    ;;
+
+    "ntsc2s")
+    layer=1
+    pos=$ntsc_pos
+    size=$ntsc_size
+    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
     "disable")
     disable_it
     zenity --info --title="TV Out" --text "TV Out has been disabled." --timeout 6