comparison src/flacng/plugin.c @ 2996:b7c181d0b325

Patch from John Lindgren <[e-mail]> to support seeking whilst paused, Debian bug #517692.

2995:1192140d9e3f

FLAC__StreamDecoder* main_decoder;
callback_info* test_info;
callback_info* main_info;
gboolean plugin_initialized = FALSE;
glong seek_to = -1;
static GThread* thread = NULL;

/* === */

void flac_init(void) {

    _LEAVE;
}

/* --- */

static gpointer flac_play_loop(gpointer arg) {

    /*
     * The main play loop.
     * Decode a frame, push the decoded data to the output plugin
     * chunkwise. Repeat until finished.
     */

    gint32* read_pointer;
    gint elements_left;
    gint seek_sample;
    FLAC__StreamDecoderState state;
    struct stream_info stream_info;
    guint sample_count;
    void* play_buffer;
    InputPlayback* playback = (InputPlayback *) arg;

         */
        main_info->write_pointer = main_info->output_buffer;
        main_info->buffer_free = BUFFER_SIZE_SAMP;
        main_info->buffer_used = 0;

        /*
         * Do we have to seek to somewhere?
         */
        if (-1 != seek_to) {
            _DEBUG("Seek requested to %d milliseconds", seek_to);

            seek_sample = (unsigned long)((gint64)seek_to * (gint64) main_info->stream.samplerate / 1000L );
            _DEBUG("Seek requested to sample %d", seek_sample);
            if (FALSE == FLAC__stream_decoder_seek_absolute(main_decoder, seek_sample)) {
                _ERROR("Could not seek to sample %d!", seek_sample);
            } else {
                /*
                 * Flush the buffers
                 */
                playback->output->flush(seek_to);
            }
            seek_to = -1;
        }

        /*
         * Have we reached the end of the stream?
         */
        state = FLAC__stream_decoder_get_state(main_decoder);

}

/* --- */

void flac_pause(InputPlayback* input, gshort p) {

    _ENTER;

    input->output->pause(p);

    _LEAVE;
}

/* --- */

void flac_mseek(InputPlayback* input, gulong millisecond) {

2996:b7c181d0b325

FLAC__StreamDecoder* main_decoder;
callback_info* test_info;
callback_info* main_info;
gboolean plugin_initialized = FALSE;
glong seek_to = -1;
static volatile char pause_flag = 0;
static GThread* thread = NULL;

/* === */

void flac_init(void) {

    _LEAVE;
}

/* --- */

static void do_seek (InputPlayback * playback) {
   playback->output->flush (seek_to);
   FLAC__stream_decoder_seek_absolute (main_decoder, (long long) seek_to * main_info->stream.samplerate / 1000);
   seek_to = -1;
}

static void do_pause (InputPlayback * playback) {
   playback->output->pause (1);
   while (pause_flag) {
      if (seek_to != -1)
         do_seek (playback);
      g_usleep(50000);
   }
   playback->output->pause (0);
}

static gpointer flac_play_loop(gpointer arg) {

    /*
     * The main play loop.
     * Decode a frame, push the decoded data to the output plugin
     * chunkwise. Repeat until finished.
     */

    gint32* read_pointer;
    gint elements_left;
    FLAC__StreamDecoderState state;
    struct stream_info stream_info;
    guint sample_count;
    void* play_buffer;
    InputPlayback* playback = (InputPlayback *) arg;

         */
        main_info->write_pointer = main_info->output_buffer;
        main_info->buffer_free = BUFFER_SIZE_SAMP;
        main_info->buffer_used = 0;

        if (seek_to != -1)
	    do_seek (playback);
        if (pause_flag)
            do_pause (playback);

        /*
         * Have we reached the end of the stream?
         */
        state = FLAC__stream_decoder_get_state(main_decoder);

}

/* --- */

void flac_pause(InputPlayback* input, gshort p) {
   pause_flag = p;
}

/* --- */

void flac_mseek(InputPlayback* input, gulong millisecond) {