Changeset 5740:b3aff85876f1 in roaraudio for roard

Timestamp:

11/09/12 02:51:16 (11 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

commit 1: Moved protocol support into new plugins protocol-esound, protocol-rplay and protocol-gopher (Closes: #311)

Location:

roard

Files:

• Makefile (modified) (1 diff)
• clients.c (modified) (1 diff)
• include/roard.h (modified) (1 diff)
• include/streams.h (modified) (1 diff)

roard/Makefile

@@ -6 +6 @@
 CF_CODEC=codecfilter_cmd.o codecfilter_vorbis.o codecfilter_celt.o codecfilter_speex.o codecfilter_alaw.o codecfilter_mulaw.o codecfilter_sndfile.o codecfilter_fishsound.o codecfilter_flac.o
 CF_CONTAINER=codecfilter_wave.o codecfilter_raum.o codecfilter_au.o
-EMUL=emul_esd.o emul_simple.o emul_rsound.o emul_rplay.o emul_gopher.o
+EMUL=emul_simple.o emul_rsound.o
 HWMIXER=hwmixer_dstr.o hwmixer_oss.o
 

roard/clients.c

@@ -33 +33 @@
 struct roar_client_server * g_clients[ROAR_CLIENTS_MAX];
 
-extern struct roar_dl_proto __proto_common_rplay;
-extern struct roar_dl_proto __proto_common_gopher;
-extern struct roar_dl_proto __proto_common_esd;
-
 static struct roard_proto_handle __protos[MAX_PROTOS] = {
  {.proto = ROAR_PROTO_ROARAUDIO, .lhandle = NULL, .type = ROARD_PROTO_TYPE_BUILDIN,
  .impl = {.buildin = 0}},
-#if !defined(ROAR_WITHOUT_DCOMP_EMUL_ESD) && defined(ROAR_HAVE_H_ESD)
- {.proto = ROAR_PROTO_ESOUND, .lhandle = NULL, .type = ROARD_PROTO_TYPE_COMMON,
- .impl = {.common = &__proto_common_esd}},
-#endif
-#ifndef ROAR_WITHOUT_DCOMP_EMUL_RPLAY
- {.proto = ROAR_PROTO_RPLAY, .lhandle = NULL, .type = ROARD_PROTO_TYPE_COMMON,
- .impl = {.common = &__proto_common_rplay}},
-#endif
-#ifndef ROAR_WITHOUT_DCOMP_EMUL_GOPHER
- {.proto = ROAR_PROTO_GOPHER, .lhandle = NULL, .type = ROARD_PROTO_TYPE_COMMON,
- .impl = {.common = &__proto_common_gopher}},
-#endif
  {.proto = -1}
 };

roard/include/roard.h

@@ -120 +120 @@
 #include "commands.h"
 #include "req.h"
-#include "emul_esd.h" /* MFOI */
 #include "emul_simple.h" /* MFOI */
 #include "emul_rsound.h" /* MFOI */
-#include "emul_rplay.h" /* MFOI */
-#include "emul_gopher.h" /* MFOI */
 #include "sources.h"
 #include "sample.h"

roard/include/streams.h

@@ -87 +87 @@
  int is_new;
  int codecfilter;
- int codec_orgi;
+ ROAR_AUDIO_INFO_TYPE codec_orgi;
  CODECFILTER_USERDATA_T codecfilter_inst;
  int socktype;