Changeset 634

Timestamp:

06/21/08 09:05:18 (5 months ago)

Author:

free

Message:

* Restart qjackctl if it dies

Location:

cdd-utils/trunk

Files:

• bin/qjackctl-wrapper (modified) (1 diff)
• debian/changelog (modified) (1 diff)
• lib/desktop.sh (modified) (1 diff)
• lib/menu.sh (modified) (1 diff)

cdd-utils/trunk/bin/qjackctl-wrapper

@@ -14 +14 @@
 
 wait_for window-picker-applet
-sleep 2
-exec qjackctl
+
+while true; do
+        qjackctl
+done

cdd-utils/trunk/debian/changelog

@@ -1 @@
-cdd-utils (0.11.2) 64studio; urgency=low
+cdd-utils (0.11.3) UNRELEASED; urgency=low
 
   * Added Extensions option to touchscreen (needed by eneryXt)
   * Wait for window-picker-applet instead of trashapplet in the
     qjackctl wrapper
+  * Restart qjackctl if it dies
 
  -- Trinity <trinity@trinity>  Wed, 18 Jun 2008 17:35:09 +0200

cdd-utils/trunk/lib/desktop.sh

@@ -194 +194 @@
 EOF
 
-    perl -e 'open(FILE, "/etc/X11/xorg.conf"); while ($line = <FILE>) {if ($line =~ /^Section "Extensions"/) {$buffer = $line;$flag = 0;until ($line =~ /^EndSection/) {$line = <FILE>; $buffer .= $line; if ($line =~ /^.*Option "MIT-SHM"/) {$flag = 1;};}; if ($flag == 0) {print $buffer;};} else {print "$line";};};close(FILE);'> $cfg.tmp
-    mv $cfg.tmp $cfg
-    if [ -z "$(tail -1 $cfg)" ]; then
-        sed '$d' < $cfg > $cfg.tmp
-        mv $cfg.tmp $cfg
-    fi
-
-    cat <<EOF >> $cfg
-Section "Extensions"
-       Option "MIT-SHM" "no"
-EndSection
-EOF
-
-}
+#    perl -e 'open(FILE, "/etc/X11/xorg.conf"); while ($line = <FILE>) {if ($line =~ /^Section "Extensions"/) {$buffer = $line;$flag = 0;until ($line =~ /^EndSection/) {$line = <FILE>; $buffer .= $line; if ($line =~ /^.*Option "MIT-SHM"/) {$flag = 1;};}; if ($flag == 0) {print $buffer;};} else {print "$line";};};close(FILE);'> $cfg.tmp
+#    mv $cfg.tmp $cfg
+#    if [ -z "$(tail -1 $cfg)" ]; then
+#       sed '$d' < $cfg > $cfg.tmp
+#       mv $cfg.tmp $cfg
+#    fi
+
+#    cat <<EOF >> $cfg
+#Section "Extensions"
+#       Option "MIT-SHM" "no"
+#EndSection
+#EOF
+
+}

cdd-utils/trunk/lib/menu.sh

@@ -10 +10 @@
     set_key "$key" "$sep" "$val" "$cfg"
   done
+}
+
+# Quiet mplayer
+menu_mplayer () {
+  cfg=/usr/share/applications/mplayer.desktop
+  if ! exists $cfg; then warning "$cfg not found"; return; fi
+  key="Exec"
+  sep="="
+  val="gmplayer -really-quiet %F"
+  set_key "$key" "$sep" "$val" "$cfg"
 }