[xiph-cvs] cvs commit: vorbis-tools/ogg123 cmdline_options.c ogg123.1 ogg123.c
Stan Seibert
volsung at xiph.org
Tue Dec 18 07:49:10 PST 2001
volsung 01/12/18 07:49:09
Modified: ogg123 Tag: volsung_kc_20011011 cmdline_options.c ogg123.1
ogg123.c
Log:
Fixed some documentation bugs.
Final statistics display works now so you get that warm, fuzzy feeling
seeing the time remaining reach exactly 0.
Revision Changes Path
No revision
No revision
1.1.2.4 +3 -2 vorbis-tools/ogg123/Attic/cmdline_options.c
Index: cmdline_options.c
===================================================================
RCS file: /usr/local/cvsroot/vorbis-tools/ogg123/Attic/cmdline_options.c,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- cmdline_options.c 2001/12/16 04:38:36 1.1.2.3
+++ cmdline_options.c 2001/12/18 15:49:05 1.1.2.4
@@ -11,7 +11,7 @@
* *
********************************************************************
- last mod: $Id: cmdline_options.c,v 1.1.2.3 2001/12/16 04:38:36 volsung Exp $
+ last mod: $Id: cmdline_options.c,v 1.1.2.4 2001/12/18 15:49:05 volsung Exp $
********************************************************************/
@@ -38,7 +38,6 @@
{"device-option", required_argument, 0, 'o'},
{"prebuffer", required_argument, 0, 'p'},
{"quiet", no_argument, 0, 'q'},
- {"save", required_argument, 0, 's'},
{"verbose", no_argument, 0, 'v'},
{"nth", required_argument, 0, 'x'},
{"ntimes", required_argument, 0, 'y'},
@@ -267,6 +266,8 @@
" -p n, --prebuffer n prebuffer n%% of the buffer before playing\n"
" -v, --verbose display progress and other status information\n"
" -q, --quiet don't display anything (no title)\n"
+ " -x n, --nth play every 'n'th block\n"
+ " -y n, --ntimes repeat every played block 'n' times\n"
" -z, --shuffle shuffle play\n"
"\n"
"ogg123 will skip to the next song on SIGINT (Ctrl-C) after s seconds after\n"
1.6.2.2.2.2 +13 -9 vorbis-tools/ogg123/ogg123.1
Index: ogg123.1
===================================================================
RCS file: /usr/local/cvsroot/vorbis-tools/ogg123/ogg123.1,v
retrieving revision 1.6.2.2.2.1
retrieving revision 1.6.2.2.2.2
diff -u -r1.6.2.2.2.1 -r1.6.2.2.2.2
--- ogg123.1 2001/12/15 15:26:26 1.6.2.2.2.1
+++ ogg123.1 2001/12/18 15:49:05 1.6.2.2.2.2
@@ -14,6 +14,12 @@
.B -k
.I seconds
] [
+.B -x
+.I nth
+] [
+.B -y
+.I ntimes
+] [
.B -b
.I buffer_size
] [
@@ -72,6 +78,13 @@
Display version information.
.IP "-v, --verbose"
Increase verbosity.
+.IP "-x n, --nth"
+Play every 'n'th decoded block. Has the effect of playing audio at 'n' times
+faster than normal speed.
+.IP "-y n, --ntimes"
+Repeat every played block 'n' times. Has the effect of playing audio 'n'
+times slower than normal speed. May be with -x for interesting fractional
+speeds.
.IP "-z, --shuffle"
Play files in pseudo-random order.
@@ -243,15 +256,6 @@
immediately, due to audio data buffering in the audio device.
This delay is system dependent, but it is usually not more
than one or two seconds.
-
-.SH NOTES
-
-The use of
-.B /etc/ogg123rc
-and
-.B ~/.ogg123rc
-has been removed in favor of the configuration system provided by
-libao. The ability to override libao will be added in a future version.
.SH FILES
1.39.2.30.2.27 +23 -4 vorbis-tools/ogg123/ogg123.c
Index: ogg123.c
===================================================================
RCS file: /usr/local/cvsroot/vorbis-tools/ogg123/ogg123.c,v
retrieving revision 1.39.2.30.2.26
retrieving revision 1.39.2.30.2.27
diff -u -r1.39.2.30.2.26 -r1.39.2.30.2.27
--- ogg123.c 2001/12/18 04:15:45 1.39.2.30.2.26
+++ ogg123.c 2001/12/18 15:49:05 1.39.2.30.2.27
@@ -14,7 +14,7 @@
* *
********************************************************************
- last mod: $Id: ogg123.c,v 1.39.2.30.2.26 2001/12/18 04:15:45 volsung Exp $
+ last mod: $Id: ogg123.c,v 1.39.2.30.2.27 2001/12/18 15:49:05 volsung Exp $
********************************************************************/
@@ -229,6 +229,24 @@
}
+void display_statistics_quick (stat_format_t *stat_format,
+ buf_t *audio_buffer,
+ data_source_t *source,
+ decoder_t *decoder)
+{
+ print_statistics_arg_t *pstats_arg;
+
+ pstats_arg = new_print_statistics_arg(stat_format,
+ source->transport->statistics(source),
+ decoder->format->statistics(decoder));
+
+ if (audio_buffer) {
+ print_statistics_action(audio_buffer, pstats_arg);
+ } else
+ print_statistics_action(NULL, pstats_arg);
+}
+
+
void print_audio_devices_info(audio_device_t *d)
{
ao_info *info;
@@ -505,9 +523,6 @@
/* Done playing this logical bitstream. Clean up house. */
- /* Print final stats */
- display_statistics(stat_format, audio_buffer, source, decoder);
-
if (audio_buffer) {
if (!sig_request.exit && !sig_request.skipfile) {
@@ -517,6 +532,10 @@
buffer_thread_kill(audio_buffer);
}
+
+ /* Print final stats */
+ display_statistics_quick(stat_format, audio_buffer, source, decoder);
+
alarm(0);
format->cleanup(decoder);
--- >8 ----
List archives: http://www.xiph.org/archives/
Ogg project homepage: http://www.xiph.org/ogg/
To unsubscribe from this list, send a message to 'cvs-request at xiph.org'
containing only the word 'unsubscribe' in the body. No subject is needed.
Unsubscribe messages sent to the list will be ignored/filtered.
More information about the commits
mailing list