Changeset 5358:f3d3dc789cd7 in roaraudio
- Timestamp:
- 12/15/11 18:52:47 (12 years ago)
- Branch:
- default
- Phase:
- public
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
include/libroarpulse/libroarpulse.h
r4960 r5358 58 58 int roar_pa_auinfo2sspec (pa_sample_spec * ss, const struct roar_audio_info * info); 59 59 60 c har * roar_pa_find_server (char * server);60 const char * roar_pa_find_server (const char * server); 61 61 62 62 int roar_pa_raerror2paerror(int error); -
libroarpulse/context.c
r5270 r5358 130 130 pa_context_flags_t flags, 131 131 const pa_spawn_api *api) { 132 133 if ( c == NULL ) 132 pa_context_flags_t flags_left = flags; 133 134 if ( c == NULL ) 135 return -1; 136 137 flags_left |= PA_CONTEXT_NOAUTOSPAWN; 138 flags_left -= PA_CONTEXT_NOAUTOSPAWN; 139 #ifdef PA_CONTEXT_NOFAIL 140 flags_left |= PA_CONTEXT_NOFAIL; 141 flags_left -= PA_CONTEXT_NOFAIL; 142 #endif 143 #ifdef PA_CONTEXT_NOFLAGS 144 flags_left |= PA_CONTEXT_NOFLAGS; 145 flags_left -= PA_CONTEXT_NOFLAGS; 146 #endif 147 148 if ( flags_left != 0 ) 134 149 return -1; 135 150 … … 140 155 } 141 156 157 // flags may contain the following values: 158 #if 0 159 PA_CONTEXT_NOFLAGS = 0x0000U, 160 /**< Flag to pass when no specific options are needed (used to avoid casting) \since 0.9.19 */ 161 PA_CONTEXT_NOAUTOSPAWN = 0x0001U, 162 /**< Disabled autospawning of the PulseAudio daemon if required */ 163 PA_CONTEXT_NOFAIL = 0x0002U 164 /**< Don't fail if the daemon is not available when pa_context_connect() is called, instead enter PA_CONTEXT_CONNECTING state and wait for the daemon to appear. \since 0.9.15 */ 165 #endif 166 142 167 // we do currently not support to spawn a daemon, so we ignore flags and api. 143 168 144 server = roar_pa_find_server( (char*)server);145 146 if ( roar_simple_connect(&(c->con), (char*)server,169 server = roar_pa_find_server(server); 170 171 if ( roar_simple_connect(&(c->con), server, 147 172 c->name != NULL ? c->name : "libroarpulse [pa_context_connect()]") == -1 ) { 148 173 c->errnum = PA_ERR_CONNECTIONREFUSED; 149 174 pa_context_set_state(c, PA_CONTEXT_FAILED); 175 176 #ifdef PA_CONTEXT_NOFAIL 177 if ( flags & PA_CONTEXT_NOFAIL ) { 178 pa_context_set_state(c, PA_CONTEXT_CONNECTING); 179 return 0; 180 } 181 #endif 150 182 return -1; 151 183 } -
libroarpulse/libroarpulse.c
r4708 r5358 39 39 40 40 #include <libroarpulse/libroarpulse.h> 41 42 int roar_codec_pulse2roar (int codec) {43 return ROAR_CODEC_DEFAULT;44 }45 41 46 42 int roar_pa_sspec2auinfo (struct roar_audio_info * info, const pa_sample_spec * ss) { … … 124 120 } 125 121 126 c har * roar_pa_find_server (char * server) {122 const char * roar_pa_find_server (const char * server) { 127 123 struct roar_x11_connection * x11con; 128 124
Note: See TracChangeset
for help on using the changeset viewer.