comparison src/audacious/playback.c @ 3319:d4f6507cded3 trunk

added a system that allows input plugins to signal to the core (actually, they MUST do it) that they're ready for playback and it's safe to call their stop function; this fixes a nasty race condition that triggered on fast track-switching

3318:6e3ae4fd65f1

#include "playback.h"
#include "playback_evlisteners.h"

static int song_info_timeout_source = 0;

void
playback_eof(void)
{
    event_queue("playback eof", playlist_get_active());
}

    if ((playback = get_current_input_playback()) == NULL)
        return;

    if (ip_data.playing)
    {
        if (playback_get_paused() == TRUE)
        {
            if (get_written_time() > 0)
              output_flush(get_written_time()); /* to avoid noise */
            playback_pause();
        }

        ip_data.playing = FALSE; 

        if (playback->plugin->stop)
            playback->plugin->stop(playback);

        if (playback->thread != NULL)
            g_thread_join(playback->thread);

        free_vis_data();
        ip_data.paused = FALSE;

	g_free(playback->filename);
	g_free(playback);
	set_current_input_playback(NULL);
    }

    ip_data.buffering = FALSE;
    ip_data.playing = FALSE;

{
    InputPlayback *playback = (InputPlayback *) data;

    playback->plugin->play_file(playback);

    if (!playback->error && ip_data.playing)
        playback_eof();
    else if (playback->error)
        playback_error();

    playback->plugin = entry->decoder;
    playback->output = &psuedo_output_plugin;
    playback->filename = g_strdup(entry->filename);
    playback->thread = g_thread_self();
    
    set_current_input_playback(playback);

    g_thread_create(playback_monitor_thread, playback, TRUE, NULL);

3319:d4f6507cded3

#include "playback.h"
#include "playback_evlisteners.h"

static int song_info_timeout_source = 0;


static gint
playback_set_pb_ready(InputPlayback *playback)
{
    g_mutex_lock(playback->pb_ready_mutex);
    playback->pb_ready_val = 1;
    g_cond_signal(playback->pb_ready_cond);
    g_mutex_unlock(playback->pb_ready_mutex);
    return 0;
}

static gint
playback_wait_for_pb_ready(InputPlayback *playback)
{
    g_mutex_lock(playback->pb_ready_mutex);
    while (playback->pb_ready_val != 1)
        g_cond_wait(playback->pb_ready_cond, playback->pb_ready_mutex);
    g_mutex_unlock(playback->pb_ready_mutex);
    return 0;
}

void
playback_eof(void)
{
    event_queue("playback eof", playlist_get_active());
}

    if ((playback = get_current_input_playback()) == NULL)
        return;

    if (ip_data.playing)
    {
        /* wait for plugin to signal it has reached
           the 'playback safe state' before stopping */
        playback_wait_for_pb_ready(playback);

        if (playback_get_paused() == TRUE)
        {
            if (get_written_time() > 0)
              output_flush(get_written_time()); /* to avoid noise */
            playback_pause();
        }

        ip_data.playing = FALSE;

        if (playback->plugin->stop)
            playback->plugin->stop(playback);

        if (playback->thread != NULL)
            g_thread_join(playback->thread);

        free_vis_data();
        ip_data.paused = FALSE;

        if (playback->pb_ready_mutex)
            g_mutex_free(playback->pb_ready_mutex);
        if (playback->pb_ready_cond)
            g_cond_free(playback->pb_ready_cond);

        g_free(playback->filename);
        g_free(playback);
        set_current_input_playback(NULL);
    }

    ip_data.buffering = FALSE;
    ip_data.playing = FALSE;

{
    InputPlayback *playback = (InputPlayback *) data;

    playback->plugin->play_file(playback);

    /* if play_file has not reached the 'safe state' before returning (an error
       occurred), set the playback ready value to 1 now, to allow for proper stop */
    playback_set_pb_ready(playback);

    if (!playback->error && ip_data.playing)
        playback_eof();
    else if (playback->error)
        playback_error();

    playback->plugin = entry->decoder;
    playback->output = &psuedo_output_plugin;
    playback->filename = g_strdup(entry->filename);
    playback->thread = g_thread_self();
    playback->pb_ready_mutex = g_mutex_new();
    playback->pb_ready_cond = g_cond_new();
    playback->pb_ready_val = 0;
    playback->set_pb_ready = playback_set_pb_ready;
    
    set_current_input_playback(playback);

    g_thread_create(playback_monitor_thread, playback, TRUE, NULL);