add ignores, remove old files

Original commit message from CVS:
add ignores, remove old files

diff --git a/tools/.gitignore b/tools/.gitignore
index a1e3dee..e3970bb 100644 (file)
--- a/tools/.gitignore
+++ b/tools/.gitignore
@@ -1 +1,4 @@
-gst-launch-ext
+gst-launch-ext-?.?
+gst-visualise-?.?
+gst-launch-ext-?.?.1
+gst-visualise-?.?.1

diff --git a/tools/Makefile.am b/tools/Makefile.am
index fcd1f58..7327fe1 100644 (file)
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -6,7 +6,7 @@ man_MANS = \
         gst-launch-ext-@GST_MAJORMINOR@.1 \
         gst-visualise-@GST_MAJORMINOR@.1
 
-CLEANFILES = $(man_MANS)
+CLEANFILES = $(man_MANS) $(bin_SCRIPTS)
 
 EXTRA_DIST = \
        gst-launch-ext-m.m gst-visualise-m.m \

diff --git a/tools/gst-launch-ext.in b/tools/gst-launch-ext.in
deleted file mode 100755 (executable)
index 0945f53..0000000
--- a/tools/gst-launch-ext.in
+++ /dev/null
@@ -1,165 +0,0 @@
-#!/usr/bin/perl -w
-use strict;
-
-# launch a gst-launch pipeline for the supplied media file
-# use the extension to determine the gst-launch pipeline
-# make use of default output sinks
-
-my (%pipes, %cfg);
-
-sub extension
-{
-  my $path = shift;
-  my $ext;
-
-  # get only the bit after the last period.  We don't deal with
-  # .tar.gz extensions do we ?
-  if ($path =~ /\./)
-  {
-    $ext = $path;
-    $ext =~ s/^.*\.//;
-  }
-  else { $ext = ""; }
-
-  return $ext;
-}
-
-sub read_config
-{
-  my $command = shift;
-
-  my $config_file = `echo -n ~`."/.gst";
-  if (-e $config_file)
-  {
-    open CONFIG, $config_file;
-    while (<CONFIG>)
-    {
-      chomp;
-      s/#.*//;
-      s/\s+$//;
-      next unless length;
-      my ($var, $value) = split (/\s*=\s*/, $_, 2);
-      $cfg{$var} = $value;
-    }
-    if (!($cfg{AUDIOSINK}))
-    {
-      print "Please add an AUDIOSINK to $config_file !\n";
-    }
-    if (!($cfg{VIDEOSINK}))
-    {
-      print "Please add a VIDEOSINK to $config_file !\n";
-    }
-  }
-  else
-  {
-    print "No configuration file $config_file found.  You might want to create one.\n";
-    print "This is not an error, just a friendly reminder... Check the man page.\n\n";
-  }
-  if (!defined $cfg{AUDIOSINK})  { $cfg{AUDIOSINK} = "osssink"; }
-  if (!defined $cfg{VIDEOSINK})  { $cfg{VIDEOSINK} = "ffcolorspace ! xvimagesink"; }
-  if (!defined $cfg{CVS_PATH})   { $cfg{CVS_PATH} =  `echo -n ~`."/gst/cvs"; }
-
-  if ($command =~ /(.+)\/gst-launch-ext$/)
-  { $cfg{COMMAND_PATH} = "$1"; }
-  else
-  { $cfg{COMMAND_PATH} = ""; }
-}
-
-sub playfile($$)
-{
-    my ($file, $ext) = @_;
-    my $command;
-    my $pipe;
-    my $path = "\$PATH:".$cfg{CVS_PATH}."/gstreamer/tools";
-
-    if ($cfg{COMMAND_PATH} ne "") {
-      $path = $cfg{COMMAND_PATH}.":$path";
-    }
-
-    $ext = lc $ext;
-
-    if ($cfg{VISUALIZER} && ($pipe = $pipes{"vis." . $ext}))
-    {
-       $command = "gst-launch-@GST_MAJORMINOR@ filesrc location=\"$file\" ! $pipe";
-       print "Running command-line\n$command\n\n";
-       system ("PATH=$path $command");
-    }
-    elsif ($pipe = $pipes{$ext})
-    {
-       $command = "gst-launch-@GST_MAJORMINOR@ filesrc location=\"$file\" ! $pipe";
-       print "Running command-line\n$command\n\n";
-       system ("PATH=$path $command");
-    }
-    else
-    {
-       print "No suitable pipe found for extension $ext.\n";
-    }
-}
-
-### main
-
-read_config ($0);
-
-%pipes = ( 
-  "ac3", "a52dec ! $cfg{AUDIOSINK}",
-  "au", "auparse ! $cfg{AUDIOSINK}",
-  "avi", "avidemux name=demux ! { queue ! spider ! $cfg{VIDEOSINK} } { demux. ! queue ! spider ! $cfg{AUDIOSINK} }",
-  "asf", "asfdemux name=demux ! { queue ! spider ! $cfg{VIDEOSINK} } { demux. ! queue ! spider ! $cfg{AUDIOSINK} }",
-  "flac", "flacdec ! $cfg{AUDIOSINK}",
-  "fli", "flxdec ! colorspace ! $cfg{VIDEOSINK}",
-  "m1v", "mpegdemux ! { queue ! mpeg2dec ! $cfg{VIDEOSINK} }",
-  "m2v", "mpegdemux ! { queue ! mpeg2dec ! $cfg{VIDEOSINK} }",
-  "m4a", "qtdemux .audio_00 ! { queue ! faad ! $cfg{AUDIOSINK} }",
-  "mod", "modplug !  $cfg{AUDIOSINK}",
-  "mp2", "mad ! $cfg{AUDIOSINK}",
-  "mp3", "mad ! $cfg{AUDIOSINK}",
-  "mpeg", "mpegdemux name=demux ! { queue ! mpeg2dec ! $cfg{VIDEOSINK} } { demux. ! queue ! mad ! $cfg{AUDIOSINK} }",
-  "mpg", "mpegdemux name=demux ! { queue ! mpeg2dec ! $cfg{VIDEOSINK} } { demux. ! queue ! mad ! $cfg{AUDIOSINK} }",
-  "ogg", "oggdemux ! vorbisdec ! audioconvert ! $cfg{AUDIOSINK}",
-  "sid", "siddec ! $cfg{AUDIOSINK}",
-  "swf", "swfdec name=swfdec ! { queue ! colorspace ! $cfg{VIDEOSINK} }  { swfdec. ! queue ! $cfg{AUDIOSINK} }",
-  "vob", "mpegdemux name=demux ! { queue ! mpeg2dec ! $cfg{VIDEOSINK} }  { demux. ! queue ! a52dec ! $cfg{AUDIOSINK} }",
-  "wav", "wavparse ! $cfg{AUDIOSINK}",
-  "wm", "asfdemux name=demux ! { queue ! spider ! $cfg{VIDEOSINK} } { demux. ! queue ! spider ! $cfg{AUDIOSINK} }",
-### a wma file can use wmav1 or wmav2 codec so we must use spider to decode it  
-  "wma", "asfdemux name=demux ! spider ! $cfg{AUDIOSINK}",
-  "wmv", "asfdemux name=demux ! { queue ! spider ! $cfg{VIDEOSINK} } { demux. ! queue ! spider ! $cfg{AUDIOSINK} }",
-  "mkv", "matroskademux name=demux ! { queue ! spider ! $cfg{VIDEOSINK} } { demux. ! queue ! spider ! $cfg{AUDIOSINK} }",
-  "mka", "matroskademux ! spider ! $cfg{AUDIOSINK}",
-);
-
-if ($cfg{VISUALIZER}) {
-  %pipes = (
-    %pipes,
-    "vis.mp3", "mad ! tee name=tee silent=true ! queue leaky=1 ! { $cfg{VISUALIZER} ! colorspace ! $cfg{VIDEOSINK} } tee. ! $cfg{AUDIOSINK}",
-    "vis.ogg", "vorbisdec ! tee name=tee silent=true ! queue leaky=1 ! { $cfg{VISUALIZER} ! colorspace ! $cfg{VIDEOSINK} } tee. ! $cfg{AUDIOSINK}",
-    "vis.wav", "wavparse ! tee name=tee silent=true ! queue leaky=1 ! { $cfg{VISUALIZER} ! colorspace ! $cfg{VIDEOSINK} } tee. ! $cfg{AUDIOSINK}",
-  );
-}              
-
-if ($#ARGV == -1) {
-    print STDERR "Usage: gst-launch-ext filename[s]\n";
-    exit 1;
-}
-
-my $file;
-while ($file = shift @ARGV) {
-    my $ext = extension ($file);
-    if (!$ext) { 
-      print "file $file doesn't have an extension !\n";
-      exit;
-    }
-    if ($ext eq 'm3u')
-    {
-       open (PLAYLIST, '<', $file);
-       my $file2;
-       while ($file2 = <PLAYLIST>) {
-           chomp $file2;
-           my $ext2 = extension ($file2);
-           playfile($file2, $ext2);
-       }
-       close PLAYLIST;
-    } else {
-       playfile($file, $ext);
-    }
-}

diff --git a/tools/gst-visualise b/tools/gst-visualise
deleted file mode 100755 (executable)
index 6e7553f..0000000
--- a/tools/gst-visualise
+++ /dev/null
@@ -1,79 +0,0 @@
-#!/usr/bin/perl -w
-
-# launch a gst-launch pipeline to display a visualisation of the 
-# input audio.
-# make use of default input srcs.
-# visualisation plugin is specified on command line.
-
-### packages
-
-use File::Basename;
-
-
-my (%pipes, %cfg);
-
-sub read_config
-{
-  my $config_file = `echo -n ~`."/.gst";
-  if (-e $config_file)
-  {
-    open CONFIG, $config_file;
-    while (<CONFIG>)
-    {
-      chomp;
-      s/#.*//;
-      s/\s+$//;
-      next unless length;
-      my ($var, $value) = split (/\s*=\s*/, $_, 2);
-      $cfg{$var} = $value;
-    }
-    if (!($cfg{AUDIOSRC}))
-    {
-      print "Please add an AUDIOSRC to $config_file !\n";
-    }
-    if (!($cfg{VIDEOSINK}))
-    {
-      print "Please add a VIDEOSINK to $config_file !\n";
-    }
-  }
-  else
-  {
-    print "No configuration file $config_file found.  You might want to create one.\n";
-  }
-  if (!defined $cfg{AUDIOSRC})   { $cfg{AUDIOSRC} = "esdmon"; }
-  if (!defined $cfg{VIDEOSINK})  { $cfg{VIDEOSINK} = "sdlvideosink"; }
-  if (!defined $cfg{CVS_PATH})   { $cfg{CVS_PATH} =  `echo -n ~`."/gst/cvs"; }
-}
-
-sub visualise(@)
-{
-    my $vis = $cfg{VISUALIZER};
-    $vis = shift() if ($#_ != -1);
-    $vis = "goom" unless $vis;
-
-    my $pipe;
-    $pipe = $vis unless $pipe = $pipes{$vis};
-
-    $command = "gst-launch $cfg{AUDIOSRC} ! $pipe ! { queue ! colorspace ! $cfg{VIDEOSINK} }";
-    print "Running $command\n";
-    system ("PATH=\$PATH:".$cfg{CVS_PATH}."/gstreamer/tools $command");
-}
-
-### main
-
-read_config ();
-
-%pipes = ( 
-  "goom", "goom",
-  "chart", "stereo2mono ! chart",
-  "synaesthesia", "synaesthesia",
-  "monoscope", "stereo2mono ! monoscope"
-);
-
-if ($#ARGV > 0) {
-    print STDERR "Usage: gst-visualise [visualiser]\n";
-    exit 1;
-}
-
-visualise(@ARGV);
-