diff options
author | waker <wakeroid@gmail.com> | 2010-11-08 22:37:38 +0100 |
---|---|---|
committer | waker <wakeroid@gmail.com> | 2010-11-08 22:37:38 +0100 |
commit | fefae21f4e8af5d90d14a5e90d259ebb32cc335c (patch) | |
tree | 5aa4ef0a8794ba3fa1ab768ae8617dccbe398d46 /plugins.c | |
parent | 3bddea0e8990413c9bceb348b64b692e55796f01 (diff) |
1st iteration of adding streamer format conversion:
added new ddb_waveformat_t structure, to be used by all decoders and outputs
adjusted mad and alsa plugins, and the streamer to compile with it
got rid of playback.h
Diffstat (limited to 'plugins.c')
-rw-r--r-- | plugins.c | 10 |
1 files changed, 5 insertions, 5 deletions
@@ -38,7 +38,6 @@ #include "playlist.h" #include "volume.h" #include "streamer.h" -#include "playback.h" #include "common.h" #include "conf.h" #include "junklib.h" @@ -931,9 +930,10 @@ plug_select_output (void) { void plug_reinit_sound (void) { - int state = p_get_state (); + DB_output_t *output = plug_get_output (); + int state = output->state (); - p_free (); + output->free (); DB_output_t *prev = plug_get_output (); if (plug_select_output () < 0) { @@ -942,13 +942,13 @@ plug_reinit_sound (void) { output_plugin = prev; } streamer_reset (1); - if (p_init () < 0) { + if (output->init () < 0) { streamer_set_nextsong (-2, 0); return; } if (state != OUTPUT_STATE_PAUSED && state != OUTPUT_STATE_STOPPED) { - if (p_play () < 0) { + if (output->play () < 0) { trace ("failed to reinit sound output\n"); streamer_set_nextsong (-2, 0); } |