Changeset 5242:97239101cee9 in roaraudio for roard/sources.c

Timestamp:

11/13/11 00:03:27 (12 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

some roard compiler warnings cleanup

File:

• roard/sources.c (modified) (8 diffs)

roard/sources.c

@@ -33 +33 @@
 
 struct roar_source g_source[] = {
- {"raw",  "Raw source",                  "/some/file",     SRC_FLAG_FHSEC, ROAR_SUBSYS_WAVEFORM, NULL,  sources_add_raw},
-#ifdef ROAR_HAVE_IO_POSIX
- {"wav",  "Old RIFF/WAVE source",        "/some/file.wav", SRC_FLAG_NONE,  ROAR_SUBSYS_WAVEFORM, sources_add_wav,  NULL},
-#endif
+ {"raw",  "DSTR source",                 "/some/file",     SRC_FLAG_FHSEC, ROAR_SUBSYS_WAVEFORM, NULL,  sources_add_dstr},
  {"cf",   "Old CF source",               "/some/file.ext", SRC_FLAG_NONE,  ROAR_SUBSYS_WAVEFORM, sources_add_cf,   NULL},
  {"roar", "New simple RoarAudio source", "some.host",      SRC_FLAG_NONE,  ROAR_SUBSYS_WAVEFORM, NULL, sources_add_roar},
@@ -250 +247 @@
 }
 
-int sources_add_raw  (int stream   , char * device, int fh, char * driver) {
+int sources_add_dstr  (int stream   , const char * device, int fh, const char * driver) {
  struct roar_stream_server * ss;
+ struct roar_vio_defaults def;
+
+ if ( roar_vio_dstr_init_defaults(&def, ROAR_VIO_DEF_TYPE_NONE, O_RDONLY, 0644) == -1 )
+  return -1;
 
  streams_get(stream, &ss);
@@ -259 +260 @@
    return -1;
  } else {
-  if ( roar_vio_open_file(&(ss->vio), device, O_RDONLY, 0644) == -1 )
+  if ( roar_vio_open_dstr(&(ss->vio), device, &def, 1) == -1 )
    return -1;
  }
@@ -266 +267 @@
 }
 
-#ifdef ROAR_HAVE_IO_POSIX
-int sources_add_wav (char * driver, char * device, char * container, char * options, int primary) {
- int stream;
- int fh;
- char buf[44];
- struct roar_stream * s;
-
- ROAR_WARN("sources_add_raw(*): The wav(e) source is obsolete, use source 'cf' (default)!");
-
- if ( (fh = open(device, O_RDONLY, 0644)) == -1 ) {
-  return -1;
- }
-
- if (read(fh, buf, 44) != 44) {
-  close(fh);
-  return -1;
- }
-
- if ( (stream = streams_new()) == -1 ) {
-  close(fh);
-  return -1;
- }
-
- streams_get_clientobj(stream, &s);
-
- memcpy(&(s->info), g_sa, sizeof(struct roar_audio_info));
-
- memcpy(&(s->info.rate    ), buf+24, 4);
- memcpy(&(s->info.channels), buf+22, 2);
- memcpy(&(s->info.bits    ), buf+34, 2);
-
- if ( streams_set_dir(stream, ROAR_DIR_PLAY, 1) == -1 ) {
-  streams_delete(stream);
-  close(fh);
-  return -1;
- }
- s->pos_rel_id = -1;
-
- streams_set_fh(stream, fh);
-
- streams_set_flag(stream, ROAR_FLAG_SOURCE);
- client_stream_add(g_source_client, stream);
-
- return 0;
-}
-#endif
-
 #define _ret(x) streams_delete(stream); return (x)
 
-int sources_add_cf (char * driver, char * device, char * container, char * options, int primary) {
+int sources_add_cf (const char * driver, const char * device, const char * container, const char * options, int primary) {
  int  stream;
  int  codec;
@@ -359 +313 @@
  ROAR_DBG("sources_add_cf(*) = ?");
 
- // TODO: finy out a better way of doing auto detetion without need for seek!
+ // TODO: find out a better way of doing auto detetion without need for seek!
  if ( options == NULL ) {
   if ( (len = roar_vio_read(vio, buf, 64)) < 1 ) {
@@ -402 +356 @@
 
 #ifndef ROAR_WITHOUT_DCOMP_CDRIVER
-int sources_add_cdriver (int stream   , char * device, int fh, char * driver) {
+int sources_add_cdriver (int stream   , const char * device, int fh, const char * driver) {
  struct roar_stream_server * ss;
 
@@ -460 +414 @@
 }
 
-int sources_add_radionoise (int stream, char * device, int fh, char * driver) {
+int sources_add_radionoise (int stream, const char * device, int fh, const char * driver) {
  struct roar_stream_server * ss;
  struct roar_audio_info    * info;
@@ -484 +438 @@
 }
 
-int sources_add_roar (int stream, char * device, int fh, char * driver) {
+int sources_add_roar (int stream, const char * device, int fh, const char * driver) {
  struct roar_stream_server * ss;
  struct roar_stream        * s;