Commit 5abc2d62 authored by conrad's avatar conrad

Rename all tools to include a hyphen.

  oggzdump  -> oggz-dump
  oggzdiff  -> oggz-diff
  oggzinfo  -> oggz-info
  oggzmerge -> oggz-merge
  oggzrip   -> oggz-rip


git-svn-id: http://svn.annodex.net/liboggz/trunk@3627 8158c8cd-e7e1-0310-9fa4-c5954c97daef
parent 2f6b59a8
......@@ -419,7 +419,7 @@ src/Makefile
src/liboggz/Version_script
src/liboggz/Makefile
src/tools/Makefile
src/tools/oggzdiff
src/tools/oggz-diff
src/tools/oggz-chop/Makefile
src/tests/Makefile
src/examples/Makefile
......
docdir=$(prefix)/share/doc/@PACKAGE@
if HAVE_DOCBOOKTOMAN
man_MANS = oggzdiff.1 oggzdump.1 oggzinfo.1 oggzmerge.1 oggz-chop.1 \
oggz-sort.1 oggzrip.1 oggz-comment.1 oggz-scan.1 oggz-validate.1
man_MANS = oggz-diff.1 oggz-dump.1 oggz-info.1 oggz-merge.1 oggz-chop.1 \
oggz-sort.1 oggz-rip.1 oggz-comment.1 oggz-scan.1 oggz-validate.1
else
man_MANS =
check:
......@@ -13,16 +13,16 @@ endif
EXTRA_DIST = $(man_MANS) Doxyfile.in \
forcefeed.fig forcefeed.eps forcefeed.png \
hungry.fig hungry.eps hungry.png \
oggzdiff.1.sgml oggzdump.1.sgml oggzinfo.1.sgml oggzmerge.1.sgml \
oggz-chop.1.sgml oggz-sort.1.sgml oggzrip.1.sgml oggz-comment.1.sgml \
oggz-diff.1.sgml oggz-dump.1.sgml oggz-info.1.sgml oggz-merge.1.sgml \
oggz-chop.1.sgml oggz-sort.1.sgml oggz-rip.1.sgml oggz-comment.1.sgml \
oggz-scan.1.sgml oggz-validate.1.sgml
# ensure doxygen-build.stamp is included, or else the documentation will
# not be built or distributed
noinst_DATA = doxygen-build.stamp
html: oggzdiff.1.html oggzdump.1.html oggzinfo.1.html oggzmerge.1.html \
oggz-chop.1.html oggz-sort.1.html oggzrip.1.html oggz-comment.1.html \
html: oggz-diff.1.html oggz-dump.1.html oggz-info.1.html oggz-merge.1.html \
oggz-chop.1.html oggz-sort.1.html oggz-rip.1.html oggz-comment.1.html \
oggz-scan.1.html oggz-validate.1.html
if HAVE_DOCBOOKTOMAN
......
......@@ -18,13 +18,13 @@ manpage.1: manpage.sgml
<!ENTITY dhsection "<manvolnum>1</manvolnum>">
<!ENTITY dhemail "<email>conrad.parker@csiro.au</email>">
<!ENTITY dhusername "CSIRO Australia">
<!ENTITY dhucpackage "<refentrytitle>oggzdiff</refentrytitle>">
<!ENTITY dhpackage "oggzdiff">
<!ENTITY dhucpackage "<refentrytitle>oggz-diff</refentrytitle>">
<!ENTITY dhpackage "oggz-diff">
<!ENTITY debian "<productname>Debian GNU/Linux</productname>">
<!ENTITY gnu "<acronym>GNU</acronym>">
]>
<refentry id="oggzdiff">
<refentry id="oggz-diff">
<refentryinfo>
<address>
......
......@@ -18,13 +18,13 @@ manpage.1: manpage.sgml
<!ENTITY dhsection "<manvolnum>1</manvolnum>">
<!ENTITY dhemail "<email>conrad.parker@csiro.au</email>">
<!ENTITY dhusername "CSIRO Australia">
<!ENTITY dhucpackage "<refentrytitle>oggzdump</refentrytitle>">
<!ENTITY dhpackage "oggzdump">
<!ENTITY dhucpackage "<refentrytitle>oggz-dump</refentrytitle>">
<!ENTITY dhpackage "oggz-dump">
<!ENTITY debian "<productname>Debian GNU/Linux</productname>">
<!ENTITY gnu "<acronym>GNU</acronym>">
]>
<refentry id="oggzdump">
<refentry id="oggz-dump">
<refentryinfo>
<address>
......@@ -131,7 +131,7 @@ manpage.1: manpage.sgml
<para>
<command>&dhpackage;</command> generates a hexadecimal or binary dump
of packets in an Ogg file, or creates an Ogg file from a hexadecimal
oggzdump file.
oggz-dump file.
</para>
</refsect1>
......@@ -238,18 +238,18 @@ manpage.1: manpage.sgml
<term>-r, --revert</term>
<listitem>
<para>
Revert an oggzdump. Generates an Ogg bitstream as prescribed
in the input oggzdump.
Revert an oggz-dump. Generates an Ogg bitstream as prescribed
in the input oggz-dump.
</para>
<para>
The serialno, granulepos and packetno fields of the packet
preambles in the oggzdump, as well as any bos or eos markers
preambles in the oggz-dump, as well as any bos or eos markers
if present, are used to structure the packets into logical
bitstreams. Hence it is advised that the original input
oggzdump not be generated with any hiding filters.
oggz-dump not be generated with any hiding filters.
</para>
<para>
Only the hexadecimal data columns of the input oggzdump are
Only the hexadecimal data columns of the input oggz-dump are
parsed when generating Ogg packet data; the printable character
representation is ignored.
</para>
......
......@@ -18,13 +18,13 @@ manpage.1: manpage.sgml
<!ENTITY dhsection "<manvolnum>1</manvolnum>">
<!ENTITY dhemail "<email>conrad.parker@csiro.au</email>">
<!ENTITY dhusername "CSIRO Australia">
<!ENTITY dhucpackage "<refentrytitle>oggzinfo</refentrytitle>">
<!ENTITY dhpackage "oggzinfo">
<!ENTITY dhucpackage "<refentrytitle>oggz-info</refentrytitle>">
<!ENTITY dhpackage "oggz-info">
<!ENTITY debian "<productname>Debian GNU/Linux</productname>">
<!ENTITY gnu "<acronym>GNU</acronym>">
]>
<refentry id="oggzinfo">
<refentry id="oggz-info">
<refentryinfo>
<address>
......
......@@ -18,13 +18,13 @@ manpage.1: manpage.sgml
<!ENTITY dhsection "<manvolnum>1</manvolnum>">
<!ENTITY dhemail "<email>conrad.parker@csiro.au</email>">
<!ENTITY dhusername "CSIRO Australia">
<!ENTITY dhucpackage "<refentrytitle>oggzmerge</refentrytitle>">
<!ENTITY dhpackage "oggzmerge">
<!ENTITY dhucpackage "<refentrytitle>oggz-merge</refentrytitle>">
<!ENTITY dhpackage "oggz-merge">
<!ENTITY debian "<productname>Debian GNU/Linux</productname>">
<!ENTITY gnu "<acronym>GNU</acronym>">
]>
<refentry id="oggzmerge">
<refentry id="oggz-merge">
<refentryinfo>
<address>
......
......@@ -18,13 +18,13 @@ manpage.1: manpage.sgml
<!ENTITY dhsection "<manvolnum>1</manvolnum>">
<!ENTITY dhemail "<email>conrad.parker@csiro.au</email>">
<!ENTITY dhusername "CSIRO Australia">
<!ENTITY dhucpackage "<refentrytitle>oggzrip</refentrytitle>">
<!ENTITY dhpackage "oggzrip">
<!ENTITY dhucpackage "<refentrytitle>oggz-rip</refentrytitle>">
<!ENTITY dhpackage "oggz-rip">
<!ENTITY debian "<productname>Debian GNU/Linux</productname>">
<!ENTITY gnu "<acronym>GNU</acronym>">
]>
<refentry id="oggzrip">
<refentry id="oggz-rip">
<refentryinfo>
<address>
......@@ -89,7 +89,7 @@ manpage.1: manpage.sgml
<para>
For example, to extract just the vorbis audio track from any Ogg file:
</para>
<para><command>oggzrip -c vorbis input.ogx > output.ogg</command>
<para><command>oggz-rip -c vorbis input.ogx > output.ogg</command>
</para>
</para>
......
......@@ -2,9 +2,9 @@
SUBDIRS = oggz-chop
EXTRA_DIST = oggzdiff
EXTRA_DIST = oggz-diff
bin_SCRIPTS = oggzdiff
bin_SCRIPTS = oggz-diff
INCLUDES = -I$(top_builddir) -I$(top_builddir)/include \
-I$(top_srcdir)/include \
......@@ -14,11 +14,11 @@ OGGZDIR = ../liboggz
OGGZ_LIBS = $(OGGZDIR)/liboggz.la @OGG_LIBS@
if OGGZ_CONFIG_READ
oggz_read_programs = oggzdump oggzinfo oggz-scan
oggz_read_programs = oggz-dump oggz-info oggz-scan
oggz_read_noinst_programs =
if OGGZ_CONFIG_WRITE
oggz_rw_programs = oggzmerge oggzrip oggz-validate oggz-comment oggz-sort
oggz_rw_programs = oggz-merge oggz-rip oggz-validate oggz-comment oggz-sort
oggz_rw_noinst_programs = oggz-basetime
endif
......@@ -30,20 +30,20 @@ noinst_HEADERS = oggz_tools.h skeleton.h
bin_PROGRAMS = $(oggz_read_programs) $(oggz_rw_programs)
noinst_PROGRAMS = $(oggz_read_noinst_programs) $(oggz_rw_noinst_programs)
oggzinfo_SOURCES = oggzinfo.c oggz_tools.c skeleton.c
oggzinfo_LDADD = $(OGGZ_LIBS) -lm
oggz_info_SOURCES = oggz-info.c oggz_tools.c skeleton.c
oggz_info_LDADD = $(OGGZ_LIBS) -lm
oggz_comment_SOURCES = oggz-comment.c oggz_tools.c
oggz_comment_LDADD = $(OGGZ_LIBS)
oggzdump_SOURCES = oggzdump.c oggz_tools.c
oggzdump_LDADD = $(OGGZ_LIBS)
oggz_dump_SOURCES = oggz-dump.c oggz_tools.c
oggz_dump_LDADD = $(OGGZ_LIBS)
oggzmerge_SOURCES = oggzmerge.c oggz_tools.c
oggzmerge_LDADD = $(OGGZ_LIBS)
oggz_merge_SOURCES = oggz-merge.c oggz_tools.c
oggz_merge_LDADD = $(OGGZ_LIBS)
oggzrip_SOURCES = oggzrip.c oggz_tools.c
oggzrip_LDADD = $(OGGZ_LIBS)
oggz_rip_SOURCES = oggz-rip.c oggz_tools.c
oggz_rip_LDADD = $(OGGZ_LIBS)
oggz_validate_SOURCES = oggz-validate.c oggz_tools.c
oggz_validate_LDADD = $(OGGZ_LIBS)
......
......@@ -31,18 +31,18 @@
## SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
version () {
echo >&2 "oggzdiff version "@VERSION@
echo >&2 "oggz-diff version "@VERSION@
exit 1
}
usage () {
echo >&2 "oggzdiff, diff oggzdumps of two Ogg files."
echo >&2 "oggz-diff, diff oggz-dumps of two Ogg files."
echo >&2
echo >&2 "Usage: oggzdiff [options] [OGGZDUMP_OPTIONS] [DIFF_OPTIONS] file1.ogg file2.ogg"
echo >&2 "Usage: oggz-diff [options] [OGGZDUMP_OPTIONS] [DIFF_OPTIONS] file1.ogg file2.ogg"
echo >&2
echo >&2 "options: [--verbose] [-v | --version] [-h | --help]"
echo >&2
echo >&2 "Supported oggzdump and diff options:"
echo >&2 "Supported oggz-dump and diff options:"
echo >&2
echo >&2 "OGGZDUMP_OPTIONS: [-b | --binary] [-x | --hexadecimal]"
echo >&2 " [-O | --hide-offset] [-S | --hide-serialno] [-G | --hide-granulepos]"
......@@ -186,12 +186,12 @@ FIFO2="${TMPDIR:-/tmp}/`basename $2`.dump-2-$$"
exec 5>$FIFO1
exec 6>$FIFO2
oggzdump $DUMPOPTS $1 >&5
oggz-dump $DUMPOPTS $1 >&5
if test "$?" != "0"; then
exit 1
fi
oggzdump $DUMPOPTS $2 >&6
oggz-dump $DUMPOPTS $2 >&6
if test "$?" != "0"; then
exit 1
fi
......
......@@ -98,8 +98,8 @@ usage (char * progname)
printf (" -G, --hide-granulepos Hide the granulepos field of each packet\n");
printf (" -P, --hide-packetno Hide the packetno field of each packet\n");
printf ("\nMode options\n");
printf (" -r, --revert Revert an oggzdump. Generates an Ogg bitstream\n");
printf (" as prescribed in the input oggzdump\n");
printf (" -r, --revert Revert an oggz-dump. Generates an Ogg bitstream\n");
printf (" as prescribed in the input oggz-dump\n");
printf ("\nMiscellaneous options\n");
printf (" -o filename, --output filename\n");
printf (" Specify output filename\n");
......
......@@ -132,7 +132,7 @@ static int show_packet_stats = 0;
static int show_extra_skeleton_info = 0;
static void
oggzinfo_apply (OI_TrackFunc func, OI_Info * info)
oggz_info_apply (OI_TrackFunc func, OI_Info * info)
{
OI_TrackInfo * oit;
long serialno;
......@@ -161,7 +161,7 @@ oi_stats_clear (OI_Stats * stats)
}
static OI_TrackInfo *
oggzinfo_trackinfo_new (void)
oggz_info_trackinfo_new (void)
{
OI_TrackInfo * oit;
......@@ -249,7 +249,7 @@ ot_fisbone_print(OI_Info * info, OI_TrackInfo *oit) {
}
}
/* oggzinfo_trackinfo_print() */
/* oggz_info_trackinfo_print() */
static void
oit_print (OI_Info * info, OI_TrackInfo * oit, long serialno)
{
......@@ -343,7 +343,7 @@ read_page_pass1 (OGGZ * oggz, const ogg_page * og, long serialno, void * user_da
oit = oggz_table_lookup (info->tracks, serialno);
if (oit == NULL) {
oit = oggzinfo_trackinfo_new ();
oit = oggz_info_trackinfo_new ();
oggz_table_insert (info->tracks, serialno, oit);
}
......@@ -457,7 +457,7 @@ oi_pass1 (OGGZ * oggz, OI_Info * info)
while ((n = oggz_read (oggz, READ_BLOCKSIZE)) > 0);
oggzinfo_apply (oit_calc_average, info);
oggz_info_apply (oit_calc_average, info);
/* Now we are at the end of the file, calculate the duration */
info->duration = oggz_tell_units (oggz);
......@@ -486,7 +486,7 @@ oi_pass2 (OGGZ * oggz, OI_Info * info)
while ((n = oggz_read (oggz, READ_BLOCKSIZE)) > 0);
oggzinfo_apply (oit_calc_stddev, info);
oggz_info_apply (oit_calc_stddev, info);
return 0;
}
......@@ -640,9 +640,9 @@ main (int argc, char ** argv)
putchar ('\n');
}
oggzinfo_apply (oit_print, &info);
oggz_info_apply (oit_print, &info);
oggzinfo_apply (oit_delete, &info);
oggz_info_apply (oit_delete, &info);
oggz_table_delete (info.tracks);
oggz_close (oggz);
......
......@@ -52,7 +52,7 @@
#define READ_SIZE 4096
#define ALL_VORBIS_WARNING \
"oggzmerge: WARNING: Merging Ogg Vorbis I files. The resulting file will\n" \
"oggz-merge: WARNING: Merging Ogg Vorbis I files. The resulting file will\n" \
" contain %d tracks in parallel, interleaved for simultaneous playback.\n"\
" If you want to sequence these files one after another, use cat instead.\n"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment