[xiph-cvs] cvs commit: vorbis-tools/ogg123 callbacks.c callbacks.h Makefile.am audio.c audio.h cmdline_options.c cmdline_options.h file_transport.c format.c format.h ogg123.c ogg123.h oggvorbis_format.c status.c status.h transport.h
Stan Seibert
volsung at xiph.org
Tue Dec 11 10:46:27 PST 2001
volsung 01/12/11 10:46:26
Modified: ogg123 Tag: volsung_kc_20011011 Makefile.am audio.c
audio.h cmdline_options.c cmdline_options.h
file_transport.c format.c format.h ogg123.c
ogg123.h oggvorbis_format.c status.c status.h
transport.h
Added: ogg123 Tag: volsung_kc_20011011 callbacks.c callbacks.h
Log:
A lot of moving stuff around to make things more sensible and avoid circular
header references. Now transports and formats have access to the ogg123
options (making them now configurable). Also moved callbacks to their
own source file.
Revision Changes Path
No revision
No revision
1.14.2.4.2.3 +4 -2 vorbis-tools/ogg123/Makefile.am
Index: Makefile.am
===================================================================
RCS file: /usr/local/cvsroot/vorbis-tools/ogg123/Makefile.am,v
retrieving revision 1.14.2.4.2.2
retrieving revision 1.14.2.4.2.3
diff -u -r1.14.2.4.2.2 -r1.14.2.4.2.3
--- Makefile.am 2001/12/08 23:59:24 1.14.2.4.2.2
+++ Makefile.am 2001/12/11 18:46:22 1.14.2.4.2.3
@@ -13,10 +13,12 @@
ogg123_LDADD = @VORBISFILE_LIBS@ @VORBIS_LIBS@ @OGG_LIBS@ @AO_LIBS@ \
@SOCKET_LIBS@ @THREAD_LIBS@ -lcurl
-ogg123_SOURCES = audio.c buffer.c cfgfile_options.c cmdline_options.c \
+ogg123_SOURCES = audio.c buffer.c callbacks.c \
+ cfgfile_options.c cmdline_options.c \
file_transport.c format.c getopt.c getopt1.c \
ogg123.c oggvorbis_format.c status.c transport.c \
- audio.h buffer.h cfgfile_options.h cmdline_options.h \
+ audio.h buffer.h callbacks.h \
+ cfgfile_options.h cmdline_options.h \
format.h getopt.h ogg123.h status.h transport.h
EXTRA_DIST = $(man_MANS) $(doc_DATA)
1.1.2.4 +12 -122 vorbis-tools/ogg123/Attic/audio.c
Index: audio.c
===================================================================
RCS file: /usr/local/cvsroot/vorbis-tools/ogg123/Attic/audio.c,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- audio.c 2001/12/11 05:29:08 1.1.2.3
+++ audio.c 2001/12/11 18:46:22 1.1.2.4
@@ -11,12 +11,10 @@
* *
********************************************************************
- last mod: $Id: audio.c,v 1.1.2.3 2001/12/11 05:29:08 volsung Exp $
+ last mod: $Id: audio.c,v 1.1.2.4 2001/12/11 18:46:22 volsung Exp $
********************************************************************/
-#define _GNU_SOURCE
-
#include <stdio.h>
#include <string.h>
#include <limits.h>
@@ -24,6 +22,17 @@
#include "audio.h"
+int audio_format_equal (audio_format_t *a, audio_format_t *b)
+{
+ return
+ a->big_endian == b->big_endian &&
+ a->word_size == b->word_size &&
+ a->signed_sample == b->signed_sample &&
+ a->rate == b->rate &&
+ a->channels == b->channels;
+}
+
+
audio_device_t *append_audio_device(audio_device_t *devices_list,
int driver_id,
ao_option *options, char *filename)
@@ -117,123 +126,4 @@
free_audio_devices (devices);
ao_shutdown();
-}
-
-
-int audio_play_callback (void *ptr, int nbytes, int eos, void *arg)
-{
- audio_play_arg_t *play_arg = (audio_play_arg_t *) arg;
- int ret;
-
- ret = audio_devices_write(play_arg->devices, ptr, nbytes);
-
- return ret ? nbytes : 0;
-}
-
-void audio_reopen_callback (buf_t *buf, void *arg)
-{
- audio_reopen_arg_t *reopen_arg = (audio_reopen_arg_t *) arg;
- audio_device_t *current;
- ao_sample_format format;
-
- /* We DO NOT want to get cancelled part way through this and have our
- audio devices in an unknown state */
- pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, NULL);
-
-
- close_audio_devices (reopen_arg->devices);
-
- /* Record audio device settings and open the devices */
- format.rate = reopen_arg->format->rate;
- format.channels = reopen_arg->format->channels;
- format.bits = reopen_arg->format->word_size * 8;
- format.byte_format = reopen_arg->format->big_endian ?
- AO_FMT_BIG : AO_FMT_LITTLE;
-
- current = reopen_arg->devices;
-
- while (current != NULL) {
- ao_info *info = ao_driver_info(current->driver_id);
-
- status_message(2, "\nDevice: %s", info->name);
- status_message(2, "Author: %s", info->author);
- status_message(2, "Comments: %s\n", info->comment);
-
- if (current->filename == NULL)
- current->device = ao_open_live(current->driver_id, &format,
- current->options);
- else
- current->device = ao_open_file(current->driver_id, current->filename,
- 0, &format, current->options);
-
- /* Report errors */
- if (current->device == NULL) {
- switch (errno) {
- case AO_ENODRIVER:
- status_error("Error: Device not available.\n");
- break;
- case AO_ENOTLIVE:
- status_error("Error: %s requires an output filename to be specified with -f.\n", info->short_name);
- break;
- case AO_EBADOPTION:
- status_error("Error: Unsupported option value to %s device.\n",
- info->short_name);
- break;
- case AO_EOPENDEVICE:
- status_error("Error: Cannot open device %s.\n",
- info->short_name);
- break;
- case AO_EFAIL:
- status_error("Error: Device failure.\n");
- break;
- case AO_ENOTFILE:
- status_error("Error: An output file cannot be given for %s device.\n", info->short_name);
- break;
- case AO_EOPENFILE:
- status_error("Error: Cannot open file %s for writing.\n",
- current->filename);
- break;
- case AO_EFILEEXISTS:
- status_error("Error: File %s already exists.\n", current->filename);
- break;
- default:
- status_error("Error: This error should never happen. Panic!\n");
- break;
- }
-
- /* We cannot recover from any of these errors */
- exit(1);
- }
-
- current = current->next_device;
- }
-
- /* Cleanup argument */
- free(reopen_arg->format);
- free(reopen_arg);
-
- pthread_setcancelstate(PTHREAD_CANCEL_ENABLE, NULL);
-}
-
-
-audio_reopen_arg_t *new_audio_reopen_arg (audio_device_t *devices,
- audio_format_t *fmt)
-{
- audio_reopen_arg_t *arg;
-
- if ( (arg = malloc(sizeof(audio_reopen_arg_t))) == NULL ) {
- status_error("Error: Out of memory in new_audio_reopen_arg().\n");
- exit(1);
- }
-
- if ( (arg->format = malloc(sizeof(audio_format_t))) == NULL ) {
- status_error("Error: Out of memory in new_audio_reopen_arg().\n");
- exit(1);
- }
-
- arg->devices = devices;
- /* Copy format in case fmt is recycled later */
- audio_format_copy(arg->format, fmt);
-
- return arg;
}
1.1.2.3 +10 -22 vorbis-tools/ogg123/Attic/audio.h
Index: audio.h
===================================================================
RCS file: /usr/local/cvsroot/vorbis-tools/ogg123/Attic/audio.h,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- audio.h 2001/12/11 05:29:08 1.1.2.2
+++ audio.h 2001/12/11 18:46:22 1.1.2.3
@@ -11,7 +11,7 @@
* *
********************************************************************
- last mod: $Id: audio.h,v 1.1.2.2 2001/12/11 05:29:08 volsung Exp $
+ last mod: $Id: audio.h,v 1.1.2.3 2001/12/11 18:46:22 volsung Exp $
********************************************************************/
@@ -22,11 +22,16 @@
#include <ao/ao.h>
-#include "buffer.h"
-#include "format.h"
-#include "status.h"
+typedef struct audio_format_t {
+ int big_endian;
+ int word_size;
+ int signed_sample;
+ int rate;
+ int channels;
+} audio_format_t;
+
/* For facilitating output to multiple devices */
typedef struct audio_device_t {
int driver_id;
@@ -36,19 +41,8 @@
struct audio_device_t *next_device;
} audio_device_t;
-/* Structures used by callbacks */
-
-typedef struct audio_play_arg_t {
- stat_format_t *stat_format;
- audio_device_t *devices;
-} audio_play_arg_t;
-
-typedef struct audio_reopen_arg_t {
- audio_device_t *devices;
- audio_format_t *format;
-} audio_reopen_arg_t;
-
+int audio_format_equal (audio_format_t *a, audio_format_t *b);
audio_device_t *append_audio_device(audio_device_t *devices_list,
int driver_id,
ao_option *options, char *filename);
@@ -57,11 +51,5 @@
void close_audio_devices (audio_device_t *devices);
void free_audio_devices (audio_device_t *devices);
void ao_onexit (void *arg);
-
-int audio_play_callback (void *ptr, int nbytes, int eos, void *arg);
-void audio_reopen_callback (buf_t *buf, void *arg);
-
-audio_reopen_arg_t *new_audio_reopen_arg (audio_device_t *devices,
- audio_format_t *fmt);
#endif /* __AUDIO_H__ */
1.1.2.2 +5 -6 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.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- cmdline_options.c 2001/12/08 23:59:24 1.1.2.1
+++ cmdline_options.c 2001/12/11 18:46:23 1.1.2.2
@@ -11,7 +11,7 @@
* *
********************************************************************
- last mod: $Id: cmdline_options.c,v 1.1.2.1 2001/12/08 23:59:24 volsung Exp $
+ last mod: $Id: cmdline_options.c,v 1.1.2.2 2001/12/11 18:46:23 volsung Exp $
********************************************************************/
@@ -22,7 +22,6 @@
#include <ao/ao.h>
#include "cmdline_options.h"
-#include "audio.h"
#include "status.h"
struct option long_options[] = {
@@ -50,7 +49,7 @@
int parse_cmdline_options (int argc, char **argv,
ogg123_options_t *ogg123_opts,
- file_option_t *file_opts)
+ file_option_t *file_opts)
{
int option_index = 1;
ao_option *temp_options = NULL;
@@ -221,9 +220,9 @@
}
ogg123_opts->devices = append_audio_device(ogg123_opts->devices,
- temp_driver_id,
- temp_options,
- NULL);
+ temp_driver_id,
+ temp_options,
+ NULL);
}
1.1.2.2 +2 -1 vorbis-tools/ogg123/Attic/cmdline_options.h
Index: cmdline_options.h
===================================================================
RCS file: /usr/local/cvsroot/vorbis-tools/ogg123/Attic/cmdline_options.h,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- cmdline_options.h 2001/12/08 23:59:25 1.1.2.1
+++ cmdline_options.h 2001/12/11 18:46:23 1.1.2.2
@@ -11,7 +11,7 @@
* *
********************************************************************
- last mod: $Id: cmdline_options.h,v 1.1.2.1 2001/12/08 23:59:25 volsung Exp $
+ last mod: $Id: cmdline_options.h,v 1.1.2.2 2001/12/11 18:46:23 volsung Exp $
********************************************************************/
@@ -20,6 +20,7 @@
#include "ogg123.h"
#include "cfgfile_options.h"
+#include "audio.h"
int parse_cmdline_options (int argc, char **argv,
ogg123_options_t *ogg123_opts,
1.1.2.3 +4 -3 vorbis-tools/ogg123/Attic/file_transport.c
Index: file_transport.c
===================================================================
RCS file: /usr/local/cvsroot/vorbis-tools/ogg123/Attic/file_transport.c,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- file_transport.c 2001/12/11 05:29:08 1.1.2.2
+++ file_transport.c 2001/12/11 18:46:23 1.1.2.3
@@ -11,15 +11,16 @@
* *
********************************************************************
- last mod: $Id: file_transport.c,v 1.1.2.2 2001/12/11 05:29:08 volsung Exp $
+ last mod: $Id: file_transport.c,v 1.1.2.3 2001/12/11 18:46:23 volsung Exp $
********************************************************************/
-#include "transport.h"
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
+#include "transport.h"
+
typedef struct file_private_t {
FILE *fp;
@@ -35,7 +36,7 @@
return 1; /* The file transport is tested last, so always try it */
}
-data_source_t* file_open (char *source_string)
+data_source_t* file_open (char *source_string, ogg123_options_t *ogg123_opts)
{
data_source_t *source;
file_private_t *private;
1.1.2.3 +1 -22 vorbis-tools/ogg123/Attic/format.c
Index: format.c
===================================================================
RCS file: /usr/local/cvsroot/vorbis-tools/ogg123/Attic/format.c,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- format.c 2001/12/11 05:29:08 1.1.2.2
+++ format.c 2001/12/11 18:46:23 1.1.2.3
@@ -11,7 +11,7 @@
* *
********************************************************************
- last mod: $Id: format.c,v 1.1.2.2 2001/12/11 05:29:08 volsung Exp $
+ last mod: $Id: format.c,v 1.1.2.3 2001/12/11 18:46:23 volsung Exp $
********************************************************************/
@@ -46,27 +46,6 @@
return formats[i];
}
-
-
-int audio_format_equal (audio_format_t *a, audio_format_t *b)
-{
- return
- a->big_endian == b->big_endian &&
- a->word_size == b->word_size &&
- a->signed_sample == b->signed_sample &&
- a->rate == b->rate &&
- a->channels == b->channels;
-}
-
-
-void audio_format_copy (audio_format_t *dest, audio_format_t *source)
-{
- dest->big_endian = source->big_endian;
- dest->word_size = source->word_size;
- dest->signed_sample = source->signed_sample;
- dest->rate = source->rate;
- dest->channels = source->channels;
-}
decoder_stats_t *malloc_decoder_stats (decoder_stats_t *to_copy)
1.1.2.3 +5 -13 vorbis-tools/ogg123/Attic/format.h
Index: format.h
===================================================================
RCS file: /usr/local/cvsroot/vorbis-tools/ogg123/Attic/format.h,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- format.h 2001/12/11 05:29:08 1.1.2.2
+++ format.h 2001/12/11 18:46:23 1.1.2.3
@@ -11,25 +11,18 @@
* *
********************************************************************
- last mod: $Id: format.h,v 1.1.2.2 2001/12/11 05:29:08 volsung Exp $
+ last mod: $Id: format.h,v 1.1.2.3 2001/12/11 18:46:23 volsung Exp $
********************************************************************/
#ifndef __FORMAT_H__
#define __FORMAT_H__
+#include "audio.h"
#include "transport.h"
+#include "ogg123.h"
-typedef struct audio_format_t {
- int big_endian;
- int word_size;
- int signed_sample;
- int rate;
- int channels;
-} audio_format_t;
-
-
typedef struct decoder_stats_t {
double total_time; /* seconds */
double current_time; /* seconds */
@@ -63,7 +56,8 @@
char *name;
int (* can_decode) (data_source_t *source);
- decoder_t* (* init) (data_source_t *source, audio_format_t *audio_fmt,
+ decoder_t* (* init) (data_source_t *source, ogg123_options_t *ogg123_opts,
+ audio_format_t *audio_fmt,
decoder_callbacks_t *callbacks, void *callback_arg);
int (* read) (decoder_t *decoder, void *ptr, int nbytes, int *eos,
audio_format_t *audio_fmt);
@@ -73,8 +67,6 @@
format_t *get_format_by_name (char *name);
format_t *select_format (data_source_t *source);
-int audio_format_equal (audio_format_t *a, audio_format_t *b);
-void audio_format_copy (audio_format_t *source, audio_format_t *dest);
decoder_stats_t *malloc_decoder_stats (decoder_stats_t *to_copy);
1.39.2.30.2.16 +5 -5 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.15
retrieving revision 1.39.2.30.2.16
diff -u -r1.39.2.30.2.15 -r1.39.2.30.2.16
--- ogg123.c 2001/12/11 15:05:56 1.39.2.30.2.15
+++ ogg123.c 2001/12/11 18:46:23 1.39.2.30.2.16
@@ -14,7 +14,7 @@
* *
********************************************************************
- last mod: $Id: ogg123.c,v 1.39.2.30.2.15 2001/12/11 15:05:56 volsung Exp $
+ last mod: $Id: ogg123.c,v 1.39.2.30.2.16 2001/12/11 18:46:23 volsung Exp $
********************************************************************/
@@ -30,6 +30,7 @@
#include "audio.h"
#include "buffer.h"
+#include "callbacks.h"
#include "cfgfile_options.h"
#include "cmdline_options.h"
#include "format.h"
@@ -142,7 +143,6 @@
opts->buffer_size = 0;
opts->prebuffer = 0.0f;
opts->default_device = NULL;
- opts->devices = NULL;
opts->status_freq = 4;
}
@@ -277,7 +277,7 @@
return;
}
- if ( (source = transport->open(source_string)) == NULL ) {
+ if ( (source = transport->open(source_string, &options)) == NULL ) {
status_error("Cannot open %s.\n", source_string);
return;
}
@@ -288,8 +288,8 @@
return;
}
- if ( (decoder = format->init(source, &new_audio_fmt, &decoder_callbacks,
- NULL)) == NULL ) {
+ if ( (decoder = format->init(source, &options, &new_audio_fmt,
+ &decoder_callbacks, NULL)) == NULL ) {
status_error("Error opening %s using the %s module."
" The file may be corrupted.\n", source_string,
format->name);
1.7.2.12.2.7 +4 -4 vorbis-tools/ogg123/ogg123.h
Index: ogg123.h
===================================================================
RCS file: /usr/local/cvsroot/vorbis-tools/ogg123/ogg123.h,v
retrieving revision 1.7.2.12.2.6
retrieving revision 1.7.2.12.2.7
diff -u -r1.7.2.12.2.6 -r1.7.2.12.2.7
--- ogg123.h 2001/12/11 15:05:56 1.7.2.12.2.6
+++ ogg123.h 2001/12/11 18:46:23 1.7.2.12.2.7
@@ -11,7 +11,7 @@
* *
********************************************************************
- last mod: $Id: ogg123.h,v 1.7.2.12.2.6 2001/12/11 15:05:56 volsung Exp $
+ last mod: $Id: ogg123.h,v 1.7.2.12.2.7 2001/12/11 18:46:23 volsung Exp $
********************************************************************/
@@ -20,7 +20,6 @@
#include <ogg/os_types.h>
#include "audio.h"
-#include "status.h"
/* Compatibility fixes */
@@ -53,8 +52,9 @@
long buffer_size; /* Size of audio buffer */
float prebuffer; /* Percent of buffer to fill before playing */
char *default_device; /* Name of default driver to use */
- audio_device_t *devices; /* Audio devices to playback to */
+ audio_device_t *devices; /* Audio devices to use */
+
double status_freq; /* Number of status updates per second */
} ogg123_options_t;
@@ -65,4 +65,4 @@
ogg_int64_t ticks;
} signal_request_t;
-#endif /* !defined(__OGG123_H) */
+#endif /* __OGG123_H__ */
1.1.2.4 +4 -3 vorbis-tools/ogg123/Attic/oggvorbis_format.c
Index: oggvorbis_format.c
===================================================================
RCS file: /usr/local/cvsroot/vorbis-tools/ogg123/Attic/oggvorbis_format.c,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- oggvorbis_format.c 2001/12/11 05:29:08 1.1.2.3
+++ oggvorbis_format.c 2001/12/11 18:46:23 1.1.2.4
@@ -11,7 +11,7 @@
* *
********************************************************************
- last mod: $Id: oggvorbis_format.c,v 1.1.2.3 2001/12/11 05:29:08 volsung Exp $
+ last mod: $Id: oggvorbis_format.c,v 1.1.2.4 2001/12/11 18:46:23 volsung Exp $
********************************************************************/
@@ -75,7 +75,8 @@
}
-decoder_t* ovf_init (data_source_t *source, audio_format_t *audio_fmt,
+decoder_t* ovf_init (data_source_t *source, ogg123_options_t *ogg123_opts,
+ audio_format_t *audio_fmt,
decoder_callbacks_t *callbacks, void *callback_arg)
{
decoder_t *decoder;
@@ -144,7 +145,7 @@
priv->bos = 0;
}
- audio_format_copy(audio_fmt, &decoder->actual_fmt);
+ *audio_fmt = decoder->actual_fmt;
/* Attempt to read as much audio as is requested */
while (nbytes > 0) {
1.1.2.7.2.6 +1 -43 vorbis-tools/ogg123/Attic/status.c
Index: status.c
===================================================================
RCS file: /usr/local/cvsroot/vorbis-tools/ogg123/Attic/status.c,v
retrieving revision 1.1.2.7.2.5
retrieving revision 1.1.2.7.2.6
diff -u -r1.1.2.7.2.5 -r1.1.2.7.2.6
--- status.c 2001/12/11 15:05:56 1.1.2.7.2.5
+++ status.c 2001/12/11 18:46:23 1.1.2.7.2.6
@@ -11,7 +11,7 @@
* *
********************************************************************
- last mod: $Id: status.c,v 1.1.2.7.2.5 2001/12/11 15:05:56 volsung Exp $
+ last mod: $Id: status.c,v 1.1.2.7.2.6 2001/12/11 18:46:23 volsung Exp $
********************************************************************/
@@ -19,7 +19,6 @@
#include <stdlib.h>
#include <pthread.h>
-#include "buffer.h"
#include "status.h"
char temp_buffer[200];
@@ -459,45 +458,4 @@
vstatus_print_nolock (fmt, ap);
pthread_mutex_unlock(&output_lock);
-}
-
-
-void print_statistics_callback (buf_t *buf, void *arg)
-{
- print_statistics_arg_t *stats_arg = (print_statistics_arg_t *) arg;
- buffer_stats_t *buffer_stats;
-
- if (buf != NULL)
- buffer_stats = buffer_statistics(buf);
- else
- buffer_stats = NULL;
-
- status_print_statistics(stats_arg->stat_format,
- buffer_stats,
- stats_arg->transport_statistics,
- stats_arg->decoder_statistics);
-
- free(stats_arg->transport_statistics);
- free(stats_arg->decoder_statistics);
- free(stats_arg);
-}
-
-
-print_statistics_arg_t *new_print_statistics_arg (
- stat_format_t *stat_format,
- data_source_stats_t *transport_statistics,
- decoder_stats_t *decoder_statistics)
-{
- print_statistics_arg_t *arg;
-
- if ( (arg = malloc(sizeof(print_statistics_arg_t))) == NULL ) {
- status_error("Error: Out of memory in new_print_statistics_arg().\n");
- exit(1);
- }
-
- arg->stat_format = stat_format;
- arg->transport_statistics = transport_statistics;
- arg->decoder_statistics = decoder_statistics;
-
- return arg;
}
1.1.2.4.2.5 +1 -13 vorbis-tools/ogg123/Attic/status.h
Index: status.h
===================================================================
RCS file: /usr/local/cvsroot/vorbis-tools/ogg123/Attic/status.h,v
retrieving revision 1.1.2.4.2.4
retrieving revision 1.1.2.4.2.5
diff -u -r1.1.2.4.2.4 -r1.1.2.4.2.5
--- status.h 2001/12/11 05:29:09 1.1.2.4.2.4
+++ status.h 2001/12/11 18:46:23 1.1.2.4.2.5
@@ -11,7 +11,7 @@
* *
********************************************************************
- last mod: $Id: status.h,v 1.1.2.4.2.4 2001/12/11 05:29:09 volsung Exp $
+ last mod: $Id: status.h,v 1.1.2.4.2.5 2001/12/11 18:46:23 volsung Exp $
********************************************************************/
@@ -43,13 +43,6 @@
} stat_format_t;
-typedef struct print_statistics_arg_t {
- stat_format_t *stat_format;
- data_source_stats_t *transport_statistics;
- decoder_stats_t *decoder_statistics;
-} print_statistics_arg_t;
-
-
/* Status options:
* stats[0] - currently playing file / stream
* stats[1] - current playback time
@@ -78,9 +71,4 @@
void status_error (const char *fmt, ...);
void vstatus_error (const char *fmt, va_list);
-void print_statistics_callback (buf_t *buf, void *arg);
-print_statistics_arg_t *new_print_statistics_arg (
- stat_format_t *stat_format,
- data_source_stats_t *transport_statistics,
- decoder_stats_t *decoder_statistics);
#endif /* __STATUS_H__ */
1.1.2.3 +3 -3 vorbis-tools/ogg123/Attic/transport.h
Index: transport.h
===================================================================
RCS file: /usr/local/cvsroot/vorbis-tools/ogg123/Attic/transport.h,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- transport.h 2001/12/11 05:29:09 1.1.2.2
+++ transport.h 2001/12/11 18:46:23 1.1.2.3
@@ -11,7 +11,7 @@
* *
********************************************************************
- last mod: $Id: transport.h,v 1.1.2.2 2001/12/11 05:29:09 volsung Exp $
+ last mod: $Id: transport.h,v 1.1.2.3 2001/12/11 18:46:23 volsung Exp $
********************************************************************/
@@ -22,8 +22,8 @@
#include <unistd.h>
#include "ogg/os_types.h"
#include "buffer.h"
+#include "ogg123.h"
-
typedef struct data_source_stats_t {
ogg_int64_t bytes_read;
int input_buffer_used; /* flag to show if this data_source uses an
@@ -45,7 +45,7 @@
typedef struct transport_t {
char *name;
int (* can_transport)(char *source_string);
- data_source_t* (* open) (char *source_string);
+ data_source_t* (* open) (char *source_string, ogg123_options_t *ogg123_opts);
int (* peek) (data_source_t *source, void *ptr, size_t size, size_t nmemb);
int (* read) (data_source_t *source, void *ptr, size_t size, size_t nmemb);
int (* seek) (data_source_t *source, long offset, int whence);
No revision
No revision
1.1.2.1 +184 -0 vorbis-tools/ogg123/Attic/callbacks.c
1.1.2.1 +61 -0 vorbis-tools/ogg123/Attic/callbacks.h
--- >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