Changeset 5740:b3aff85876f1 in roaraudio for roard


Ignore:
Timestamp:
11/09/12 02:51:16 (7 years ago)
Author:
phi
Branch:
default
Message:

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

Location:
roard
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • roard/Makefile

    r5575 r5740  
    66CF_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 
    77CF_CONTAINER=codecfilter_wave.o codecfilter_raum.o codecfilter_au.o 
    8 EMUL=emul_esd.o emul_simple.o emul_rsound.o emul_rplay.o emul_gopher.o 
     8EMUL=emul_simple.o emul_rsound.o 
    99HWMIXER=hwmixer_dstr.o hwmixer_oss.o 
    1010 
  • roard/clients.c

    r5739 r5740  
    3333struct roar_client_server * g_clients[ROAR_CLIENTS_MAX]; 
    3434 
    35 extern struct roar_dl_proto __proto_common_rplay; 
    36 extern struct roar_dl_proto __proto_common_gopher; 
    37 extern struct roar_dl_proto __proto_common_esd; 
    38  
    3935static struct roard_proto_handle __protos[MAX_PROTOS] = { 
    4036 {.proto = ROAR_PROTO_ROARAUDIO, .lhandle = NULL, .type = ROARD_PROTO_TYPE_BUILDIN, 
    4137 .impl = {.buildin = 0}}, 
    42 #if !defined(ROAR_WITHOUT_DCOMP_EMUL_ESD) && defined(ROAR_HAVE_H_ESD) 
    43  {.proto = ROAR_PROTO_ESOUND, .lhandle = NULL, .type = ROARD_PROTO_TYPE_COMMON, 
    44  .impl = {.common = &__proto_common_esd}}, 
    45 #endif 
    46 #ifndef ROAR_WITHOUT_DCOMP_EMUL_RPLAY 
    47  {.proto = ROAR_PROTO_RPLAY, .lhandle = NULL, .type = ROARD_PROTO_TYPE_COMMON, 
    48  .impl = {.common = &__proto_common_rplay}}, 
    49 #endif 
    50 #ifndef ROAR_WITHOUT_DCOMP_EMUL_GOPHER 
    51  {.proto = ROAR_PROTO_GOPHER, .lhandle = NULL, .type = ROARD_PROTO_TYPE_COMMON, 
    52  .impl = {.common = &__proto_common_gopher}}, 
    53 #endif 
    5438 {.proto = -1} 
    5539}; 
  • roard/include/roard.h

    r5624 r5740  
    120120#include "commands.h" 
    121121#include "req.h" 
    122 #include "emul_esd.h" /* MFOI */ 
    123122#include "emul_simple.h" /* MFOI */ 
    124123#include "emul_rsound.h" /* MFOI */ 
    125 #include "emul_rplay.h" /* MFOI */ 
    126 #include "emul_gopher.h" /* MFOI */ 
    127124#include "sources.h" 
    128125#include "sample.h" 
  • roard/include/streams.h

    r5624 r5740  
    8787 int is_new; 
    8888 int codecfilter; 
    89  int codec_orgi; 
     89 ROAR_AUDIO_INFO_TYPE codec_orgi; 
    9090 CODECFILTER_USERDATA_T codecfilter_inst; 
    9191 int socktype; 
Note: See TracChangeset for help on using the changeset viewer.