Changeset ad34c30


Ignore:
Timestamp:
Aug 14, 2010, 3:19:40 PM (14 years ago)
Author:
Kyle Brogle <broglek@…>
Branches:
debian
Children:
2ee7f19
Parents:
b349e5d (diff), 335786f (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
git-author:
Kyle Brogle <broglek@…> (08/14/10 15:19:40)
git-committer:
Kyle Brogle <broglek@…> (08/14/10 15:19:40)
Message:

Merge branch 'master' into debian

Files:
29 added
4 edited

Legend:

Unmodified
Added
Removed

  • README

    rb58aada r22be2fa  
    5555      CUPS_SERVER=servername cancel [ID|-a] queuename
    5656
    57 TODO:
     57BUGS:
    5858
    59 - include mixer and channel in debconf, or even better, move it to
    60   gutenbach-remctl and implement debconf in that package
    61 
    62 - this should really not conflict with pulse (the biggest problem at
    63   the moment is that pulse will spew a bunch of errors like "Home
    64   directory /var/spool/cups/tmp not ours." I can't figure out how to
    65   get rid of them, but they're really annoying.  As long as pulse is
    66   in system mode, things seem to work otherwise.)
    67 
    68 - CUPS issues
    69 
    70     * the CUPS daemon processes do not inherit groups from the lp user
    71       (so, for example, even if we add 'lp' to 'audio', the process
    72       will not be running in group 'audio').  For the time being, I've
    73       set the CUPS daemon to always run under group 'audio', but there
    74       should really be a better solution.
    75 
    76     * when the Purge-Jobs command is sent, the jobs are removed, but
    77       the current mplayer instance continues playing.  This
    78       unfortunately leads to jobs being played over each other when
    79       the CUPS server restarts
    80 
    81 - Making it easier to use across multiple platforms, regardless of
    82   debathena/normal linux/etc?
    83 
    84 - Gutenbach should not depend on Debathena -- ideally,
    85   gutenbach-server should be debathena free, and then if people want
    86   to use zephyr, etc., they can install an additional gutenbach-zephyr
    87   package or something
    88 
    89 - add client scripts for the remctl package, something maybe like
    90   `gbvol [set|get] number`.  Or maybe just leave it with using remctl.
    91 
    92 - fix the web interface
    93 
    94 - Make it possible to play movies; i.e. add video support (the audio
    95   support is already there, obviously)
     59Please file bug reports in our Trac instance, located at
     60http://gutenbach.mit.edu/trac

  • client/bin/gbrm

    r9fdf4a1 r335786f  
    1212
    1313my $q = $ARGV[0];
    14 my $id = $ARGV[1];
     14my @ids = @ARGV[1 .. $#ARGV];
    1515
    16 if (!$q or !$id) {
     16if (!$q or !@ids) {
    1717    print $usage;
    1818    exit 1
    … …  
    4242}
    4343my @jobs = $printer->getJobs(0, 0);
    44 
     44foreach my $id(@ids){
    4545if ($id eq "all") {
    4646    foreach $id(@jobs) {
    … …  
    5757}
    5858else {
    59     cancel_job($id, $printer);
     59    foreach my $item(@jobs) {
     60        if($item =~ /$id/){
     61            cancel_job($item, $printer);
     62        }
     63    }
     64}
    6065}
    6166
    … …  
    6772
    6873    print "Canceled job '$title' (id $id)\n";
     74 
    6975}

  • server/lib/gutenbach

    rb58aada r79fac02  
    116116  print(ZEPH "Playback aborted.\n");
    117117  close(ZEPH);
     118
     119  open(STATUS, ">", "/var/run/gutenbach/status");
     120  print(STATUS "");
     121  close(STATUS);
    118122  die;
    119123}
    … …  
    130134my ($newpath);
    131135
     136open(STATUS, ">", "/var/run/gutenbach/status");
     137
    132138if ($magic) {
    133139  # $magic means that Image::ExifTool was able to identify the type of file
    134140  printf(ZEPHYR "%s file %s\n", $magic, $arguments{"job-title"});
     141  printf(STATUS "%s file %s\n", $magic, $arguments{"job-title"});
    135142  $status .= sprintf(" Filetype: %s.", $magic);
    136143  $status .= sprintf(" Filename: %s.", $arguments{"job-title"});
    … …  
    138145  if (exists $fileinfo->{'Title'}) {
    139146    printf(ZEPHYR "\@b{%s}\n", $fileinfo->{'Title'}) if exists $fileinfo->{'Title'};
     147    #printf(STATUS "%s\n", $fileinfo->{'Title'}) if exists $fileinfo->{'Title'};
    140148    $status .= sprintf(" Title: %s.", $fileinfo->{'Title'});
    141149  }
    … …  
    143151    if (exists $fileinfo->{$key}) {
    144152      printf(ZEPHYR "%s\n", $fileinfo->{$key}) if exists $fileinfo->{$key};
     153      printf(STATUS "%s\n", $fileinfo->{$key}) if exists $fileinfo->{$key};
    145154      $status .= sprintf(" %s: %s\n", $key, $fileinfo->{$key});
    146155    }
    … …  
    200209
    201210close(ZEPHYR);
     211close(STATUS);
    202212print CUPS "NOTICE: $status\n";
    203213play_mplayer_audio($filepath, \%arguments);
    … …  
    329339      print ZEPHYR "Playback completed successfully.\n";
    330340      close(ZEPHYR);
     341      open(STATUS, ">", "/var/run/gutenbach/status");
     342      print(STATUS "");
     343      close(STATUS);
    331344    }
    332345    close(MP3STATUS) || print ZEPHYR "mplayer exited $?\n";

  • .gitignore

    rb58aada r1d7e681  
    11*~
     2debian/files
     3debian/*.debhelper
     4debian/*.substvars
     5debian/*.debhelper.log
     6debian/gutenbach/
     7debian/gutenbach-client/
     8debian/gutenbach-queue/
     9debian/gutenbach-remctl/
     10debian/gutenbach-server/
     11debian/stamp-makefile-build
     12debian/tmp/
    213client/bin/*.1.gz
    3 debian/
Note: See TracChangeset for help on using the changeset viewer.