comparison src/streambrowser/streambrowser.c @ 2817:779125caa3ac

added xiph icon; smaller icons for streamdirs; fetch queue fix; up/down keys in tree view no longer focus the search entry

2815:cc6f02424609

static GtkWidget *playlist_menu_item;
static GtkWidget *main_menu_item;
static GQueue *update_thread_data_queue = NULL;
static GMutex *update_thread_mutex = NULL;
static gint update_thread_count = 0;

streambrowser_cfg_t streambrowser_cfg;

static GeneralPlugin sb_plugin = 
{

    debug("requested streamdir update (streamdir = '%s', category = '%s', streaminfo = '%s')\n", 
          streamdir == NULL ? "" : streamdir->name, 
          category == NULL ? "" : category->name,
          streaminfo == NULL ? "" : streaminfo->name);

    if (update_thread_count >= MAX_UPDATE_THREADS) {
        debug("another %d streamdir updates are pending, this request will be dropped\n", update_thread_count);
    }
    else {
        g_mutex_lock(update_thread_mutex);
        
    	/* do we have a running thread? */
        if (update_thread_count > 0) {
            int i;
            gboolean exists = FALSE;
            update_thread_data_t *update_thread_data;

            /* search for another identic update request */

                }
            }
            
            /* if no other similar request exists, we enqueue it */
            if (!exists) {
                debug("another %d streamdir updates are pending, this request will be queued\n", update_thread_count);

                update_thread_data = g_malloc(sizeof(update_thread_data_t));

                update_thread_data->streamdir = streamdir;
                update_thread_data->category = category;
                update_thread_data->streaminfo = streaminfo;
 
                g_queue_push_tail(update_thread_data_queue, update_thread_data);
                update_thread_count++;
            }
            else {
                debug("this request is already present in the queue, dropping\n");          
            }
        }

            data->streamdir = streamdir;
            data->category = category;
            data->streaminfo = streaminfo;
 
            g_queue_push_tail(update_thread_data_queue, data);
            update_thread_count++;

			g_thread_create((GThreadFunc) update_thread_core, NULL, FALSE, NULL);
        }

        g_mutex_unlock(update_thread_mutex);

	debug("entering update thread core\n");

	/* try to get the last item in the queue, but don't remove it */
	g_mutex_lock(update_thread_mutex);
	update_thread_data_t *data = NULL;
	if (update_thread_count > 0) {
		data = g_queue_peek_head(update_thread_data_queue);
	}
	g_mutex_unlock(update_thread_mutex);

	/* repetitively process the queue elements, until queue is empty */
	while (data != NULL && update_thread_count > 0) {
	    /* update a streaminfo - that is - add this streaminfo to playlist */
		if (data->streaminfo != NULL) {
	    	gdk_threads_enter();
			streambrowser_win_set_streaminfo_state(data->streamdir, data->category, data->streaminfo, TRUE);
	    	gdk_threads_leave();

		g_mutex_lock(update_thread_mutex);

		/* remove the just processed data from the queue */
		g_queue_pop_head(update_thread_data_queue);
		update_thread_count--;	

		/* try to get the last item in the queue */
		if (update_thread_count > 0)
			data = g_queue_pop_head(update_thread_data_queue);
		else
			data = NULL;
		g_mutex_unlock(update_thread_mutex);
	}

	debug("leaving update thread core\n");

2817:779125caa3ac

static GtkWidget *playlist_menu_item;
static GtkWidget *main_menu_item;
static GQueue *update_thread_data_queue = NULL;
static GMutex *update_thread_mutex = NULL;

streambrowser_cfg_t streambrowser_cfg;

static GeneralPlugin sb_plugin = 
{

    debug("requested streamdir update (streamdir = '%s', category = '%s', streaminfo = '%s')\n", 
          streamdir == NULL ? "" : streamdir->name, 
          category == NULL ? "" : category->name,
          streaminfo == NULL ? "" : streaminfo->name);

    if (g_queue_get_length(update_thread_data_queue) >= MAX_UPDATE_THREADS) {
        debug("another %d streamdir updates are pending, this request will be dropped\n", g_queue_get_length(update_thread_data_queue));
    }
    else {
        g_mutex_lock(update_thread_mutex);
        
    	/* do we have a running thread? */
        if (g_queue_get_length(update_thread_data_queue) > 0) {
            int i;
            gboolean exists = FALSE;
            update_thread_data_t *update_thread_data;

            /* search for another identic update request */

                }
            }
            
            /* if no other similar request exists, we enqueue it */
            if (!exists) {
                debug("another %d streamdir updates are pending, this request will be queued\n", g_queue_get_length(update_thread_data_queue));

                update_thread_data = g_malloc(sizeof(update_thread_data_t));

                update_thread_data->streamdir = streamdir;
                update_thread_data->category = category;
                update_thread_data->streaminfo = streaminfo;
 
                g_queue_push_tail(update_thread_data_queue, update_thread_data);
            }
            else {
                debug("this request is already present in the queue, dropping\n");          
            }
        }

            data->streamdir = streamdir;
            data->category = category;
            data->streaminfo = streaminfo;
 
            g_queue_push_tail(update_thread_data_queue, data);

			g_thread_create((GThreadFunc) update_thread_core, NULL, FALSE, NULL);
        }

        g_mutex_unlock(update_thread_mutex);

	debug("entering update thread core\n");

	/* try to get the last item in the queue, but don't remove it */
	g_mutex_lock(update_thread_mutex);
	update_thread_data_t *data = NULL;
	if (g_queue_get_length(update_thread_data_queue) > 0) {
		data = g_queue_peek_head(update_thread_data_queue);
	}
	g_mutex_unlock(update_thread_mutex);

	/* repetitively process the queue elements, until queue is empty */
	while (data != NULL && g_queue_get_length(update_thread_data_queue) > 0) {
	    /* update a streaminfo - that is - add this streaminfo to playlist */
		if (data->streaminfo != NULL) {
	    	gdk_threads_enter();
			streambrowser_win_set_streaminfo_state(data->streamdir, data->category, data->streaminfo, TRUE);
	    	gdk_threads_leave();

		g_mutex_lock(update_thread_mutex);

		/* remove the just processed data from the queue */
		g_queue_pop_head(update_thread_data_queue);

		/* try to get the last item in the queue */
		if (g_queue_get_length(update_thread_data_queue) > 0)
			data = g_queue_peek_head(update_thread_data_queue);
		else
			data = NULL;

		g_mutex_unlock(update_thread_mutex);
	}

	debug("leaving update thread core\n");