summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--tools/.gitignore2
-rw-r--r--tools/Makefile.am19
-rw-r--r--tools/gst-discoverer-1.0.1 (renamed from tools/gst-discoverer.1.in)0
-rw-r--r--tools/gst-visualise-m.m77
-rw-r--r--tools/gst-visualise.1.in31
5 files changed, 6 insertions, 123 deletions
diff --git a/tools/.gitignore b/tools/.gitignore
index a2650b52f..b6276e635 100644
--- a/tools/.gitignore
+++ b/tools/.gitignore
@@ -1,3 +1 @@
-gst-visualise-?.*
-gst-visualise-?.*.1
gst-discoverer-*
diff --git a/tools/Makefile.am b/tools/Makefile.am
index 946b1f9b2..99392f86b 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -1,8 +1,6 @@
-bin_SCRIPTS = \
- gst-visualise-@GST_API_VERSION@
+bin_SCRIPTS =
man_MANS = \
- gst-visualise-@GST_API_VERSION@.1 \
gst-discoverer-@GST_API_VERSION@.1
bin_PROGRAMS = \
@@ -10,10 +8,10 @@ bin_PROGRAMS = \
gst_discoverer_@GST_API_VERSION@_SOURCES = gst-discoverer.c
-CLEANFILES = $(man_MANS) $(bin_SCRIPTS) $(bin_PROGRAMS)
+CLEANFILES = $(bin_SCRIPTS) $(bin_PROGRAMS)
EXTRA_DIST = \
- gst-visualise-m.m gst-visualise.1.in gst-discoverer.1.in
+ gst-discoverer.1.in
LDADD = $(top_builddir)/gst-libs/gst/pbutils/libgstpbutils-@GST_API_VERSION@.la \
@@ -24,11 +22,6 @@ LDADD = $(top_builddir)/gst-libs/gst/pbutils/libgstpbutils-@GST_API_VERSION@.la
AM_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS)
-# generate versioned scripts from templates
-%-@GST_API_VERSION@: %-m.m
- $(AM_V_GEN)sed -e s,\@GST_API_VERSION\@,@GST_API_VERSION@,g $< > $@ && \
- chmod +x $@
-
# generate man pages
%-@GST_API_VERSION@.1: %.1.in
$(AM_V_GEN)sed \
@@ -38,12 +31,12 @@ AM_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS)
all: all-am chmod
chmod: $(bin_SCRIPTS)
- @chmod +x $^
+# @chmod +x $^
Android.mk: Makefile.am
- androgenizer -:PROJECT gst-discoverer \
+ androgenizer -:PROJECT gst-discoverer-@GST_API_VERSION@ \
-:REL_TOP $(top_srcdir) -:ABS_TOP $(abs_top_srcdir) \
- -:EXECUTABLE gst-discoverer -:TAGS eng debug \
+ -:EXECUTABLE gst-discoverer-@GST_API_VERSION@ -:TAGS eng debug \
-:SOURCES $(gst_discoverer_@GST_API_VERSION@_SOURCES) \
-:CFLAGS $(DEFS) $(AM_CFLAGS) \
-:LDFLAGS -lgstpbutils-@GST_API_VERSION@ -lgstvideo-@GST_API_VERSION@ \
diff --git a/tools/gst-discoverer.1.in b/tools/gst-discoverer-1.0.1
index c266596b8..c266596b8 100644
--- a/tools/gst-discoverer.1.in
+++ b/tools/gst-discoverer-1.0.1
diff --git a/tools/gst-visualise-m.m b/tools/gst-visualise-m.m
deleted file mode 100644
index eea4b598c..000000000
--- a/tools/gst-visualise-m.m
+++ /dev/null
@@ -1,77 +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
-
-
-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} = "osssrc"; }
- if (!defined $cfg{VIDEOSINK}) { $cfg{VIDEOSINK} = "xvimagesink"; }
- 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-@GST_API_VERSION@ $cfg{AUDIOSRC} ! $pipe ! { queue ! videoconvert ! $cfg{VIDEOSINK} }";
- print "Running $command\n";
- system ("PATH=\$PATH:".$cfg{CVS_PATH}."/gstreamer/tools $command");
-}
-
-### main
-
-read_config ();
-
-%pipes = (
- "goom", "goom",
- "chart", "audioconvert ! chart",
- "synaesthesia", "synaesthesia",
- "monoscope", "audioconvert ! monoscope"
-);
-
-if ($#ARGV > 0) {
- print STDERR "Usage: gst-visualise [visualiser]\n";
- exit 1;
-}
-
-visualise(@ARGV);
-
diff --git a/tools/gst-visualise.1.in b/tools/gst-visualise.1.in
deleted file mode 100644
index 4b7b3e3d9..000000000
--- a/tools/gst-visualise.1.in
+++ /dev/null
@@ -1,31 +0,0 @@
-.TH "GStreamer" "1" "February 2002" "" ""
-.SH "NAME"
-gst\-visualise \- Run a GStreamer pipeline to display an audio visualisation
-.SH "SYNOPSIS"
-\fBgst\-visualise\fR \fI[visualiser]\fR
-.SH "DESCRIPTION"
-.LP
-\fIgst\-visualise\fP is a tool that is used to run a basic \fIGStreamer\fP pipeline, to display a graphical visualisation of an audio stream.
-
-By default, the audio stream is read from ESD (the Enlightened Sound Daemon),
-but this can be changed by setting the AUDIOSRC parameter in ~/.gst. For
-example, you might set "AUDIOSRC=osssrc" to display a visualisation of the
-sound input to your soundcard.
-
-You can select a visualiser by providing a parameter naming the visualiser.
-For example:
-
- gst\-visualise synaesthesia
-
-will use the synaesthesia plugin. If no visualiser is named, the VISUALIZER
-property in ~/.gst will be used. If this is not specified either, the goom
-visualiser will be used.
-
-The videosink to use to display the visualisation will be read from the
-VIDEOSINK parameter in ~/.gst, defaulting to sdlvideosink.
-
-.SH "SEE ALSO"
-.BR gst\-inspect (1),
-.BR gst\-launch (1),
-.SH "AUTHOR"
-The GStreamer team at http://gstreamer.net/