comparison src/audacious/ui_main.c @ 3165:8775dfc57ead trunk

Remove mainwin_set_info_text() craq. Still some work to do.

3160:03ff51c6412f

#include "ui_skinned_menurow.h"
#include "ui_skinned_playstatus.h"
#include "ui_skinned_monostereo.h"
#include "ui_jumptotrack.h"

static GTimeVal cb_time; /* click delay for tristate is defined by TRISTATE_THRESHOLD */

#define ITEM_SEPARATOR {"/-", NULL, NULL, 0, "<Separator>"}
#define TRISTATE_THRESHOLD 200

        gdk_flush();
    }
}


void
mainwin_set_info_text(void)
{
    gchar *text;

    if (mainwin_info_text_locked)
        return;

    if ((text = input_get_info_text()) != NULL) {
        ui_skinned_textbox_set_text(mainwin_info, text);
        g_free(text);
    }
    else if ((text = playlist_get_info_text(playlist_get_active())) != NULL) {
        ui_skinned_textbox_set_text(mainwin_info, text);
        g_free(text);
    }
}

static gchar *mainwin_tb_old_text = NULL;

void
mainwin_lock_info_text(const gchar * text)
{

        else
            ui_skinned_textbox_set_text(mainwin_info, mainwin_tb_old_text);
        g_free(mainwin_tb_old_text);
        mainwin_tb_old_text = NULL;
    }
    else
        mainwin_set_info_text();    /* XXX: best we can do */
}


static gchar *
make_mainwin_title(const gchar * title)

static void
mainwin_mr_change(GtkWidget *widget, MenuRowItem i)
{
    switch (i) {
    case MENUROW_NONE:
        mainwin_set_info_text();
        break;
    case MENUROW_OPTIONS:
        mainwin_lock_info_text(_("Options Menu"));
        break;
    case MENUROW_ALWAYS:
        if (UI_SKINNED_MENUROW(mainwin_menurow)->always_selected)

        else
            mainwin_lock_info_text(_("Enable 'Doublesize'"));
        break;
    case MENUROW_VISUALIZATION:
        mainwin_lock_info_text(_("Visualization Menu"));
        break;
    }
}

static void

    bmp_drag_dest_set(mainwin);

    g_signal_connect(mainwin, "key_press_event",
                     G_CALLBACK(mainwin_keypress), NULL);
}

void
mainwin_create(void)
{

        gtk_window_set_title(GTK_WINDOW(mainwin), mainwin_title_text);
        g_free(mainwin_title_text);
        mainwin_title_text = NULL;
        G_UNLOCK(mainwin_title);

        mainwin_set_info_text();
        playlistwin_update_list(playlist_get_active());
    }

    /* tristate buttons seek */
    if ( seek_state != MAINWIN_SEEK_NIL )

3165:8775dfc57ead

#include "ui_skinned_menurow.h"
#include "ui_skinned_playstatus.h"
#include "ui_skinned_monostereo.h"
#include "ui_jumptotrack.h"

#include "ui_main_evlisteners.h"

static GTimeVal cb_time; /* click delay for tristate is defined by TRISTATE_THRESHOLD */

#define ITEM_SEPARATOR {"/-", NULL, NULL, 0, "<Separator>"}
#define TRISTATE_THRESHOLD 200

        gdk_flush();
    }
}


static gchar *mainwin_tb_old_text = NULL;

void
mainwin_lock_info_text(const gchar * text)
{

        else
            ui_skinned_textbox_set_text(mainwin_info, mainwin_tb_old_text);
        g_free(mainwin_tb_old_text);
        mainwin_tb_old_text = NULL;
    }
}


static gchar *
make_mainwin_title(const gchar * title)

static void
mainwin_mr_change(GtkWidget *widget, MenuRowItem i)
{
    switch (i) {
    case MENUROW_OPTIONS:
        mainwin_lock_info_text(_("Options Menu"));
        break;
    case MENUROW_ALWAYS:
        if (UI_SKINNED_MENUROW(mainwin_menurow)->always_selected)

        else
            mainwin_lock_info_text(_("Enable 'Doublesize'"));
        break;
    case MENUROW_VISUALIZATION:
        mainwin_lock_info_text(_("Visualization Menu"));
        break;
    case MENUROW_NONE:
        break;
    }
}

static void

    bmp_drag_dest_set(mainwin);

    g_signal_connect(mainwin, "key_press_event",
                     G_CALLBACK(mainwin_keypress), NULL);

    ui_main_evlistener_init();
}

void
mainwin_create(void)
{

        gtk_window_set_title(GTK_WINDOW(mainwin), mainwin_title_text);
        g_free(mainwin_title_text);
        mainwin_title_text = NULL;
        G_UNLOCK(mainwin_title);

        playlistwin_update_list(playlist_get_active());
    }

    /* tristate buttons seek */
    if ( seek_state != MAINWIN_SEEK_NIL )