comparison src/vorbis/vorbis.c @ 2375:22641735c9b1

- fixed freezing on track end - remember that buffer_free() returns _free_ space, not used.

2371:47f6f73438c3

 * Note that this uses vorbisfile, which is not (currently)
 * thread-safe.
 */

#include "config.h"

#define DEBUG

#define REMOVE_NONEXISTANT_TAG(x)   if (x != NULL && !*x) { x = NULL; }

#include <glib.h>
#include <gtk/gtk.h>

         */
        if (bytes <= 0 && bytes != OV_HOLE) {
           /*
            * EOF
            */
            playback->playing = 0;
            playback->output->buffer_free();
            playback->output->buffer_free();
            playback->eof = TRUE;
            current_section = last_section;
        }

        

        if (current_section <= last_section) {
            /*
             * The info struct is different in each section.  vf
             * holds them all for the given bitstream.  This

            if (vi->rate != samplerate || vi->channels != channels) {
                samplerate = vi->rate;
                channels = vi->channels;
                playback->output->buffer_free();
                playback->output->buffer_free();
                playback->output->close_audio();
                if (!playback->output->
                        open_audio(FMT_FLOAT, vi->rate, vi->channels)) {
                    playback->error = TRUE;
                    playback->eof = TRUE;

            last_section = current_section;
         
        }
    } /* main loop */

    if (!playback->error)
        playback->output->close_audio();
    /* fall through intentional */

    /*this loop makes it not skip the last ~4 seconds, but the playback 
     * timer isn't updated in this period, so it still needs a bit of work 
     *
     * majeru
     */
    while(playback->output->buffer_playing()&& playback->output->buffer_free())
        g_usleep(50000);


    play_cleanup:
    g_free(title);

     */
    g_mutex_lock(vf_mutex);
    ov_clear(&vf);
    g_mutex_unlock(vf_mutex);
    playback->playing = 0;
    playback->output->buffer_free();
    return NULL;
}

static void
vorbis_play(InputPlayback *playback)

static void
vorbis_stop(InputPlayback *playback)
{
    if (playback->playing) {
        playback->playing = 0;
        g_thread_join(thread);
    }
}

static void
vorbis_pause(InputPlayback *playback, short p)

2375:22641735c9b1

 * Note that this uses vorbisfile, which is not (currently)
 * thread-safe.
 */

#include "config.h"
/*
#define AUD_DEBUG
#define DEBUG
*/

#define REMOVE_NONEXISTANT_TAG(x)   if (x != NULL && !*x) { x = NULL; }

#include <glib.h>
#include <gtk/gtk.h>

         */
        if (bytes <= 0 && bytes != OV_HOLE) {
           /*
            * EOF
            */
            AUDDBG("EOF\n");
            playback->playing = 0;
            playback->eof = TRUE;
            current_section = last_section;
        }

        if (current_section <= last_section) {
            /*
             * The info struct is different in each section.  vf
             * holds them all for the given bitstream.  This

            if (vi->rate != samplerate || vi->channels != channels) {
                samplerate = vi->rate;
                channels = vi->channels;
                while(playback->output->buffer_playing()) g_usleep(50000);
                playback->output->close_audio();
                if (!playback->output->
                        open_audio(FMT_FLOAT, vi->rate, vi->channels)) {
                    playback->error = TRUE;
                    playback->eof = TRUE;

            last_section = current_section;
         
        }
    } /* main loop */

    if (!playback->error) {
        /*this loop makes it not skip the last ~4 seconds, but the playback 
         * timer isn't updated in this period, so it still needs a bit of work 
         *
         * majeru
         */
        if(playback->eof) /* do it only on EOF --asphyx */
            while(playback->output->buffer_playing()) {
                AUDDBG("waiting for empty output buffer\n");
                g_usleep(50000);
            }

        playback->output->close_audio();
    }


    play_cleanup:
    g_free(title);

     */
    g_mutex_lock(vf_mutex);
    ov_clear(&vf);
    g_mutex_unlock(vf_mutex);
    playback->playing = 0;
    return NULL;
}

static void
vorbis_play(InputPlayback *playback)

static void
vorbis_stop(InputPlayback *playback)
{
    if (playback->playing) {
        playback->playing = 0;
        AUDDBG("waiting for playback thread finished\n");
        g_thread_join(thread);
        AUDDBG("playback finished\n");
    }
}

static void
vorbis_pause(InputPlayback *playback, short p)