comparison src/wma/wma.c @ 2438:038e90348306

Remove static values, making the plugin re-entrant. As such, remove the now unnecessary playback mutex.

2437:6b07b92a0308

static const int ST_BUFF = 1024;

static int wma_decode = 0;
static gboolean wma_pause = 0;
static int wma_seekpos = -1;
static int wma_st_buff, wma_idx, wma_idx2;
static GThread *wma_decode_thread;
GStaticMutex wma_mutex = G_STATIC_MUTEX_INIT;
static uint8_t *wma_outbuf, *wma_s_outbuf;

char description[64];
static void wma_about(void);
static void wma_init(void);
static int wma_is_our_fd(char *filename, VFSFile *fd);

    AVCodecContext *c = NULL;
    AVFormatContext *ic = NULL;
    uint8_t *inbuf_ptr;
    int out_size, size, len;
    AVPacket pkt;

    if(av_open_input_file(&ic, playback->filename, NULL, 0, NULL) < 0) return;

    for(wma_idx = 0; wma_idx < ic->nb_streams; wma_idx++) {
        c = &ic->streams[wma_idx]->codec;

    wma_decode = 1;
    playback->playing = 1;
    wma_decode_thread = g_thread_self();
    playback->set_pb_ready(playback);

    g_static_mutex_lock(&wma_mutex);
    while(playback->playing)
    {
        if(wma_seekpos != -1)
        {
            av_seek_frame(ic, wma_idx, wma_seekpos * 1000000LL);

    if(wma_s_outbuf) g_free(wma_s_outbuf);
    if(wma_outbuf) g_free(wma_outbuf);
    if(pkt.data) av_free_packet(&pkt);
    if(c) avcodec_close(c);
    if(ic) av_close_input_file(ic);
    g_static_mutex_unlock(&wma_mutex);
}

static void wma_stop(InputPlayback *playback) 
{
    wma_decode = 0;

2438:038e90348306

static const int ST_BUFF = 1024;

static int wma_decode = 0;
static gboolean wma_pause = 0;
static int wma_seekpos = -1;
static GThread *wma_decode_thread;

char description[64];
static void wma_about(void);
static void wma_init(void);
static int wma_is_our_fd(char *filename, VFSFile *fd);

    AVCodecContext *c = NULL;
    AVFormatContext *ic = NULL;
    uint8_t *inbuf_ptr;
    int out_size, size, len;
    AVPacket pkt;
    guint8 *wma_outbuf, *wma_s_outbuf;
    int wma_st_buff, wma_idx, wma_idx2;

    if(av_open_input_file(&ic, playback->filename, NULL, 0, NULL) < 0) return;

    for(wma_idx = 0; wma_idx < ic->nb_streams; wma_idx++) {
        c = &ic->streams[wma_idx]->codec;

    wma_decode = 1;
    playback->playing = 1;
    wma_decode_thread = g_thread_self();
    playback->set_pb_ready(playback);

    while(playback->playing)
    {
        if(wma_seekpos != -1)
        {
            av_seek_frame(ic, wma_idx, wma_seekpos * 1000000LL);

    if(wma_s_outbuf) g_free(wma_s_outbuf);
    if(wma_outbuf) g_free(wma_outbuf);
    if(pkt.data) av_free_packet(&pkt);
    if(c) avcodec_close(c);
    if(ic) av_close_input_file(ic);
}

static void wma_stop(InputPlayback *playback) 
{
    wma_decode = 0;