use gst 1.0, add new network interfaces (eno1, etc.)

diff --git a/telecaster/models.py b/telecaster/models.py
index eb1a801b66feae523ebfd2222932449c5aa30914..146f6cee09cafe9d9c5c71f9acc94bf6eac6d4c2 100644 (file)
--- a/telecaster/models.py
+++ b/telecaster/models.py
@@ -188,7 +188,7 @@ class Station(Model):
         conf_file.close()
 
     def deefuzzer_start(self):
-        command = 'deefuzzer ' + self.deefuzzer_file.path + ' > /dev/null &'
+        command = '/usr/local/bin/deefuzzer ' + self.deefuzzer_file.path + ' > /dev/null &'
         os.system(command)
         time.sleep(0.5)
         pid = get_pid('deefuzzer', args=self.deefuzzer_file.path)

diff --git a/telecaster/tools/status.py b/telecaster/tools/status.py
index c22297c3d98b6656b9281f45a596cdfc49887fc6..676aa73d32706907d9dbcb7edd5795c5779e89ee 100644 (file)
--- a/telecaster/tools/status.py
+++ b/telecaster/tools/status.py
@@ -109,8 +109,8 @@ class Status(object):
     def get_ids(self):
         self.jacking = get_pid('jackd', args=False) != None
 
-        self.audio_encoding = get_pid('gst-launch-0.10', args='lamemp3enc') != None
-        self.video_encoding = get_pid('gst-launch-0.10', args='vp8enc') != None
+        self.audio_encoding = get_pid('gst-launch-1.0', args='lamemp3enc') != None
+        self.video_encoding = get_pid('gst-launch-1.0', args='vp8enc') != None
 
         self.audio_monitoring = get_pid('deefuzzer', args=self.mp3_monitoring_conf) != None
         self.video_monitoring = get_pid('deefuzzer', args=self.webm_monitoring_conf) != None

diff --git a/telecaster/views.py b/telecaster/views.py
index 2e9b2a6832e79df33b2aec55d1cb7475eabc9152..218e3110e897b9fd8232cf04cfc251916cdb6c4d 100644 (file)
--- a/telecaster/views.py
+++ b/telecaster/views.py
@@ -45,7 +45,8 @@ def get_host(request):
 
 class Status(object):
 
-    interfaces = ['eth0', 'eth1', 'eth2', 'eth0-eth2', 'eth3', 'eth4', 'eth5', 'eth6', 'eth7', 'eth8', 'eth9',
+    interfaces = ['eth0', 'eth1', 'eth2', 'eth0-eth2', 'eth3', 'eth4', 'eth5',
+                  'eth6', 'eth7', 'eth8', 'eth9', 'eno0', 'eno1',
                   'wlan0', 'wlan1', 'wlan2', 'wlan3', 'wlan4']
     
     acpi_states = {0: 'battery', 1: 'battery', 2: 'AC'}
@@ -114,8 +115,8 @@ class Status(object):
     def get_pids(self):
         self.jacking = get_pid('jackd', args=False) != None
 
-        self.audio_encoding = get_pid('gst-launch-0.10', args='lamemp3enc') != None
-        self.video_encoding = get_pid('gst-launch-0.10', args='vp8enc') != None
+        self.audio_encoding = get_pid('gst-launch-1.0', args='lamemp3enc') != None
+        self.video_encoding = get_pid('gst-launch-1.0', args='vp8enc') != None
 
         self.audio_monitoring = get_pid('deefuzzer', args=self.mp3_monitoring_conf) != None
         self.video_monitoring = get_pid('deefuzzer', args=self.webm_monitoring_conf) != None