Changes in / [8b0a844:4d5d9d7]

Files:

• client/bin/gbr (modified) (1 diff)
• remctl/lib/gutenbach/volume-down (modified) (1 diff)
• remctl/lib/gutenbach/volume-get (modified) (1 diff)
• remctl/lib/gutenbach/volume-helper.py (added)
• remctl/lib/gutenbach/volume-set (modified) (1 diff)
• remctl/lib/gutenbach/volume-up (modified) (1 diff)
• server/lib/gutenbach (modified) (3 diffs)

client/bin/gbr

@@ -52 +52 @@
 foreach my $file(@files) {
     if ($file =~ m|http://www\.youtube\.com/watch\?v=|) {
-        open FILE, ">", "/tmp/gutenbach-youtube\n" or die "Couldn't create temporary file";
+        open FILE, ">", "/tmp/gutenbach-youtube" or die "Couldn't create temporary file";
         print FILE $file;
         $title = $file;

remctl/lib/gutenbach/volume-down

@@ -1 +1 @@
 #!/bin/sh
 PATH="$(dirname $0):$PATH"
-volume-set . $(( $(volume-get .) - 1 ))
+
+python "$(dirname $0)/volume-helper.py" -
+
+#volume-set . $(( $(volume-get .) - 1 ))

remctl/lib/gutenbach/volume-get

@@ -5 +5 @@
 channel=$(/usr/lib/gutenbach/gutenbach-get-config channel)
 
-amixer get $mixer | grep "$channel" \
- | perl -lne 'print $1 if (/: Playback ([0-9]+)/)'
+amixer get $mixer | grep "^  $channel" | perl -lpe "s/  $channel: Playback //g;s/\[off\]/muted/g;s/\[on\]//g"  

remctl/lib/gutenbach/volume-set

@@ -1 +1 @@
 #!/bin/sh
 PATH="$(dirname $0):$PATH"
+
+# $1 is string "set" and is unused (passed in via remctl)
+# $2 is the actual volume
 
 mixer=$(/usr/lib/gutenbach/gutenbach-get-config mixer)
 channel=$(/usr/lib/gutenbach/gutenbach-get-config channel)
 
-amixer set $mixer "$2" | grep "$channel" \
- | perl -lne 'print $1 if (/: Playback ([0-9]+)/)'
+amixer set $mixer -- "$2" | grep "^  $channel" | perl -lpe "s/  $channel: Playback //g;s/\[off\]/muted/g;s/\[on\]//g"
 
 volume-zephyr

remctl/lib/gutenbach/volume-up

@@ -1 +1 @@
 #!/bin/sh
 PATH="$(dirname $0):$PATH"
-volume-set . $(( $(volume-get .) + 1 ))
+
+python "$(dirname $0)/volume-helper.py" +
+
+#volume-set . $(( $(volume-get .) + 1 ))

server/lib/gutenbach

@@ -133 +133 @@
 my ($tempdir);
 my ($newpath);
+my ($title);
 
 open(STATUS, ">", "/var/run/gutenbach/status");
@@ -139 +140 @@
   # $magic means that Image::ExifTool was able to identify the type of file
   printf(ZEPHYR "%s file %s\n", $magic, $arguments{"job-title"});
-  printf(STATUS "%s file %s\n", $magic, $arguments{"job-title"});
+  #printf(STATUS $arguments{"job-title"});
   $status .= sprintf(" Filetype: %s.", $magic);
   $status .= sprintf(" Filename: %s.", $arguments{"job-title"});
-
   if (exists $fileinfo->{'Title'}) {
+      $title = $fileinfo->{'Title'};
     printf(ZEPHYR "\@b{%s}\n", $fileinfo->{'Title'}) if exists $fileinfo->{'Title'};
-    #printf(STATUS "%s\n", $fileinfo->{'Title'}) if exists $fileinfo->{'Title'};
+    printf(STATUS "%s\n", $fileinfo->{'Title'}) if exists $fileinfo->{'Title'};
     $status .= sprintf(" Title: %s.", $fileinfo->{'Title'});
   }
@@ -174 +175 @@
     # YouTube URLs are resolved by the youtube-dl command.
     # Launch youtube-dl
-    $pid = open(YTDL, "-|");
-    if ($pid) {
-        print ZEPHYR "YouTube video $filepath.\nCurrently downloading, please wait...";
-        close ZEPHYR;
-        while (<YTDL>) {
-            open(ZEPHYR, "|-", @zwrite_command);
-            print ZEPHYR $_;
-            close ZEPHYR;
-        }
-        open(ZEPHYR, "|-", @zwrite_command);
-        print ZEPHYR "Done downloading.";
-        close ZEPHYR;
-    }
-    else {
-        my @args = ("youtube-dl", "-q", "-o", "/tmp/youtube.flv", $filepath);
-        exec(@args) or die "Couldn't exec youtube-dl";
-    }
-
-    $filepath = "/tmp/youtube.flv";
-    # Print the title to zephyr and the status string.
+    $pid = open(YTDL, "-|", "youtube-dl","-b", "-g", $filepath) or die "Unable to invoke youtube-dl";
+        print ZEPHYR "YouTube video $filepath\n$title";
+        $status .= " YouTube video $filepath. $title.";
+        # youtube-dl prints the URL of the flash video, which we pass to mplayer as a filename.
+        $filepath = <YTDL>;
+        chomp $filepath;
+
+
   } else { # Doesn't appear to be a YouTube URL.
     print STDERR "Resolved external reference to $filepath\n";