comparison src/recpt1.c @ 149:a9f60d56d673

Fix DLNA problem

148:da6ea0ef68ff

         *        2.2.3.1 enqueue() $B$O(B tdata->stream_queue->mutex $B$r(B lock/unlock $B$7$F=q$-9~$_;~$NF1;~99?7$rKI;_$7$F$$$k(B
         */
        /*
         * DLNA $B$G$N(BSID$BJQ99$N<BAu<B83(B
         */
        if ( use_dlna && buf.size > 0 ) {
            if ( use_splitter ) {
                new_sid = atoi(ut->request_channel);
                if ( old_sid != new_sid ) {
                    old_sid = new_sid;
                    split_shutdown(splitter);

                        use_splitter = FALSE;
                    }
                    split_select_finish = TSS_ERROR;
                    free(qbuf);
                    qbuf = NULL;
                    time(&split_start_time);
                    continue;
                }
            }
            do {

149:a9f60d56d673

         *        2.2.3.1 enqueue() $B$O(B tdata->stream_queue->mutex $B$r(B lock/unlock $B$7$F=q$-9~$_;~$NF1;~99?7$rKI;_$7$F$$$k(B
         */
        /*
         * DLNA $B$G$N(BSID$BJQ99$N<BAu<B83(B
         */
        if ( use_dlna && buf.size > 0 &&
             strcmp("all", ut->request_channel)) {
            if ( use_splitter ) {
                new_sid = atoi(ut->request_channel);
                if ( old_sid != new_sid ) {
                    old_sid = new_sid;
                    split_shutdown(splitter);

                        use_splitter = FALSE;
                    }
                    split_select_finish = TSS_ERROR;
                    free(qbuf);
                    qbuf = NULL;

                    pthread_mutex_lock(&data->stream_queue->mutex);
                    while(1) {
                         STREAM_QUEUE_T *p_queue = data->stream_queue;
                         if (p_queue->num_used == 0)
                             break;
                         free(p_queue->buffer[p_queue->out]->data);
                         p_queue->buffer[p_queue->out]->data = NULL;
                         free(p_queue->buffer[p_queue->out]);
                         p_queue->buffer[p_queue->out] = NULL;
                         p_queue->out++;
                         p_queue->out %= p_queue->size;

                         /* update counters */
                         p_queue->num_avail++;
                         p_queue->num_used--;
                    }
                    pthread_mutex_unlock(&data->stream_queue->mutex);
                    fprintf (stderr, "reader_func() free stream queue finish.\n");
                    time(&split_start_time);
                    continue;
                }
            }
            do {