From: yomguy <>
Date: Tue, 23 Nov 2010 18:41:51 +0000 (+0000)
Subject: fix stop, go to 44100 on FT Pro, add icons for rotate_desktop
X-Git-Tag: 1.0~115
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=3064afd79c3ac9bdd7017c463a3bc8d8fbaed3c0;p=telecaster-server.git

fix stop, go to 44100 on FT Pro, add icons for rotate_desktop
---

diff --git a/conf/etc/default/jackd b/conf/etc/default/jackd
index e34aacd..759a33d 100644
--- a/conf/etc/default/jackd
+++ b/conf/etc/default/jackd
@@ -5,5 +5,5 @@ START_DAEMON=yes
 USER=telecaster
 
 # Options to pass to jackd
-OPTIONS="-dalsa -r48000 -p1024 -n3 -D -Chw:0 -Phw:0 "
+OPTIONS="-R -dalsa -r44100 -p512 -n3 -D -Chw:1,1 -Phw:1,0 "
 
diff --git a/conf/etc/telecaster/edcast_jack_local.cfg b/conf/etc/telecaster/edcast_jack_local.cfg
index 16db86a..1638c6e 100644
--- a/conf/etc/telecaster/edcast_jack_local.cfg
+++ b/conf/etc/telecaster/edcast_jack_local.cfg
@@ -19,7 +19,7 @@ AutoConnect=1
 Encode=MP3
 # General settings (non-codec related).  Note : NumberChannels = 1 for MONO, 2 for STEREO
 NumberChannels=1
-Samplerate=48000
+Samplerate=44100
 BitrateNominal=64
 BitrateMin=32
 BitrateMax=96
diff --git a/img/desktop/128x128/apps/preferences-desktop-rotate.png b/img/desktop/128x128/apps/preferences-desktop-rotate.png
new file mode 100644
index 0000000..bfb895a
Binary files /dev/null and b/img/desktop/128x128/apps/preferences-desktop-rotate.png differ
diff --git a/img/desktop/16x16/apps/preferences-desktop-rotate.png b/img/desktop/16x16/apps/preferences-desktop-rotate.png
new file mode 100644
index 0000000..9462513
Binary files /dev/null and b/img/desktop/16x16/apps/preferences-desktop-rotate.png differ
diff --git a/img/desktop/22x22/apps/preferences-desktop-rotate.png b/img/desktop/22x22/apps/preferences-desktop-rotate.png
new file mode 100644
index 0000000..5fe835e
Binary files /dev/null and b/img/desktop/22x22/apps/preferences-desktop-rotate.png differ
diff --git a/img/desktop/32x32/apps/preferences-desktop-rotate.png b/img/desktop/32x32/apps/preferences-desktop-rotate.png
new file mode 100644
index 0000000..a89a5fa
Binary files /dev/null and b/img/desktop/32x32/apps/preferences-desktop-rotate.png differ
diff --git a/img/desktop/48x48/apps/preferences-desktop-rotate.png b/img/desktop/48x48/apps/preferences-desktop-rotate.png
new file mode 100644
index 0000000..5e909be
Binary files /dev/null and b/img/desktop/48x48/apps/preferences-desktop-rotate.png differ
diff --git a/img/desktop/64x64/apps/preferences-desktop-rotate.png b/img/desktop/64x64/apps/preferences-desktop-rotate.png
new file mode 100644
index 0000000..0c96c53
Binary files /dev/null and b/img/desktop/64x64/apps/preferences-desktop-rotate.png differ
diff --git a/img/desktop/8x8/apps/preferences-desktop-rotate.png b/img/desktop/8x8/apps/preferences-desktop-rotate.png
new file mode 100644
index 0000000..e89cb80
Binary files /dev/null and b/img/desktop/8x8/apps/preferences-desktop-rotate.png differ
diff --git a/img/rotate_desktop.desktop b/img/rotate_desktop.desktop
new file mode 100644
index 0000000..4182a90
--- /dev/null
+++ b/img/rotate_desktop.desktop
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Name=Rotate Desktop
+Exec=~/bin/rotate_desktop
+Icon=preferences-desktop-rotate
+Type=Application
+Comment=Rotate Desktop for 180 degrees with the touchscreen
+GenericName=Rotate Desktop
+Categories=Utility;Accessibility;
+Terminal=false
+
diff --git a/telecaster.py b/telecaster.py
index dc260eb..d08f103 100755
--- a/telecaster.py
+++ b/telecaster.py
@@ -127,7 +127,7 @@ class TeleCaster:
 
 	else:
 	    os.system('kill -9 '+deefuzzer_pid[0])
-	    self.main()
+	    #self.main()
       
 
 conf_file = '/etc/telecaster/telecaster.xml'