Mercurial > audlegacy-plugins
changeset 2702:4b3fe27d5ca6
Automated merge with ssh://hg.atheme.org//hg/audacious-plugins
| author | Matti Hamalainen <ccr@tnsp.org> |
|---|---|
| date | Fri, 13 Jun 2008 05:17:23 +0300 |
| parents | 99dd09396885 (diff) ca2e5680b74e (current diff) |
| children | 3d7282254b03 |
| files | |
| diffstat | 17 files changed, 18 insertions(+), 109 deletions(-) [+] |
line wrap: on
line diff
--- a/src/adplug/adplug-xmms.cc Fri Jun 13 05:02:07 2008 +0300 +++ b/src/adplug/adplug-xmms.cc Fri Jun 13 05:17:23 2008 +0300 @@ -1158,8 +1158,6 @@ adplug_info_box, NULL, // output plugin (filled by XMMS) adplug_get_tuple, - NULL, - NULL, adplug_is_our_fd, (gchar **)fmts, };
--- a/src/alac/alac.c Fri Jun 13 05:02:07 2008 +0300 +++ b/src/alac/alac.c Fri Jun 13 05:17:23 2008 +0300 @@ -263,7 +263,9 @@ } return i; } -#elif defined(__GNUC__) && (defined(_X86) || defined(__i386) || defined(i386)) + +#elif defined(__GNUC__) && (defined(_X86) || defined(__i386) || defined(i386) \ + || defined(_X86_64) || defined(__x86_64__) || defined(x86_64)) /* for some reason the unrolled version (below) is * actually faster than this. yay intel! */
--- a/src/console/Audacious_Driver.cxx Fri Jun 13 05:02:07 2008 +0300 +++ b/src/console/Audacious_Driver.cxx Fri Jun 13 05:17:23 2008 +0300 @@ -483,8 +483,6 @@ NULL, get_song_tuple, NULL, - NULL, - NULL, (gchar **)gme_fmts, NULL, probe_for_tuple,
--- a/src/modplug/plugin.cxx Fri Jun 13 05:02:07 2008 +0300 +++ b/src/modplug/plugin.cxx Fri Jun 13 05:17:23 2008 +0300 @@ -118,8 +118,6 @@ ShowFileInfoBox, NULL, // output GetSongTuple, - NULL, - NULL, CanPlayFileFromVFS, // vfs (gchar **)fmts, NULL,
--- a/src/musepack/libmpc.cxx Fri Jun 13 05:02:07 2008 +0300 +++ b/src/musepack/libmpc.cxx Fri Jun 13 05:17:23 2008 +0300 @@ -37,8 +37,6 @@ mpcFileInfoBox, //Show File Info Box [CALLBACK] NULL, //Output Plugin Handle OutputPlugin output mpcGetSongTuple,//Acquire tuple for song [CALLBACK] - NULL, - NULL, mpcIsOurFD, (gchar **)mpc_fmts };
--- a/src/scrobbler/Makefile Fri Jun 13 05:02:07 2008 +0300 +++ b/src/scrobbler/Makefile Fri Jun 13 05:17:23 2008 +0300 @@ -19,4 +19,5 @@ CFLAGS += ${PLUGIN_CFLAGS} CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${BEEP_DEFINES} ${CURL_CFLAGS} -I../.. +LDFLAGS += ${AUDLDFLAGS} LIBS += ${GTK_LIBS} ${GLIB_LIBS} ${CURL_LIBS} ${MUSICBRAINZ_LIBS} ${MOWGLI_LIBS} -laudutil
--- a/src/skins/ui_playlist.c Fri Jun 13 05:02:07 2008 +0300 +++ b/src/skins/ui_playlist.c Fri Jun 13 05:17:23 2008 +0300 @@ -658,12 +658,6 @@ gtk_widget_set_size_request(playlistwin_sinfo, playlistwin_get_width() - 35, aud_active_skin->properties.textbox_bitmap_font_height); - GList *iter; - for (iter = GTK_FIXED (SKINNED_WINDOW(playlistwin)->fixed)->children; iter; iter = g_list_next (iter)) { - GtkFixedChild *child_data = (GtkFixedChild *) iter->data; - GtkWidget *child = child_data->widget; - g_signal_emit_by_name(child, "redraw"); - } g_mutex_unlock(resize_mutex); }
--- a/src/skins/ui_skinned_button.c Fri Jun 13 05:02:07 2008 +0300 +++ b/src/skins/ui_skinned_button.c Fri Jun 13 05:17:23 2008 +0300 @@ -30,7 +30,6 @@ RELEASED, CLICKED, DOUBLED, - REDRAW, LAST_SIGNAL }; @@ -78,7 +77,6 @@ static gint ui_skinned_button_enter_notify(GtkWidget *widget, GdkEventCrossing *event); static gint ui_skinned_button_leave_notify(GtkWidget *widget, GdkEventCrossing *event); -static void ui_skinned_button_redraw(UiSkinnedButton *button); GType ui_skinned_button_get_type() { static GType button_type = 0; @@ -128,7 +126,6 @@ klass->released = button_released; klass->clicked = NULL; klass->scaled = ui_skinned_button_toggle_scaled; - klass->redraw = ui_skinned_button_redraw; button_signals[PRESSED] = g_signal_new ("pressed", G_OBJECT_CLASS_TYPE (object_class), G_SIGNAL_RUN_FIRST, @@ -150,11 +147,6 @@ G_STRUCT_OFFSET (UiSkinnedButtonClass, scaled), NULL, NULL, gtk_marshal_VOID__VOID, G_TYPE_NONE, 0); - button_signals[REDRAW] = - g_signal_new ("redraw", G_OBJECT_CLASS_TYPE (object_class), G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION, - G_STRUCT_OFFSET (UiSkinnedButtonClass, redraw), NULL, NULL, - gtk_marshal_VOID__VOID, G_TYPE_NONE, 0); - g_type_class_add_private (gobject_class, sizeof (UiSkinnedButtonPrivate)); } @@ -495,16 +487,6 @@ gtk_widget_queue_draw(widget); } -static void ui_skinned_button_redraw(UiSkinnedButton *button) { - UiSkinnedButtonPrivate *priv = UI_SKINNED_BUTTON_GET_PRIVATE (button); - if (priv->move_x || priv->move_y) - gtk_fixed_move(GTK_FIXED(gtk_widget_get_parent(GTK_WIDGET(button))), GTK_WIDGET(button), - button->x+priv->move_x, button->y+priv->move_y); - - gtk_widget_queue_draw(GTK_WIDGET(button)); -} - - void ui_skinned_set_push_button_data(GtkWidget *button, gint nx, gint ny, gint px, gint py) { UiSkinnedButtonPrivate *priv = UI_SKINNED_BUTTON_GET_PRIVATE(button); if (nx > -1) priv->nx = nx; @@ -529,10 +511,13 @@ priv->skin_index2 = si; } -void ui_skinned_button_move_relative(GtkWidget *button, gint x, gint y) { - UiSkinnedButtonPrivate *priv = UI_SKINNED_BUTTON_GET_PRIVATE (button); +void ui_skinned_button_move_relative(GtkWidget *widget, gint x, gint y) { + UiSkinnedButton *button = UI_SKINNED_BUTTON(widget); + UiSkinnedButtonPrivate *priv = UI_SKINNED_BUTTON_GET_PRIVATE(widget); priv->move_x += x; priv->move_y += y; + gtk_fixed_move(GTK_FIXED(gtk_widget_get_parent(widget)), widget, + button->x+priv->move_x, button->y+priv->move_y); } void ui_skinned_button_set_inside(GtkWidget *widget, gboolean inside) {
--- a/src/skins/ui_skinned_button.h Fri Jun 13 05:02:07 2008 +0300 +++ b/src/skins/ui_skinned_button.h Fri Jun 13 05:17:23 2008 +0300 @@ -57,7 +57,6 @@ void (* clicked) (UiSkinnedButton *button); void (* right_clicked) (UiSkinnedButton *button); void (* scaled) (UiSkinnedButton *button); - void (* redraw) (UiSkinnedButton *button); }; GType ui_skinned_button_get_type(void) G_GNUC_CONST;
--- a/src/skins/ui_skinned_horizontal_slider.h Fri Jun 13 05:02:07 2008 +0300 +++ b/src/skins/ui_skinned_horizontal_slider.h Fri Jun 13 05:17:23 2008 +0300 @@ -53,7 +53,6 @@ void (* motion) (UiSkinnedHorizontalSlider *horizontal_slider); void (* release) (UiSkinnedHorizontalSlider *horizontal_slider); void (* scaled) (UiSkinnedHorizontalSlider *horizontal_slider); - void (* redraw) (UiSkinnedHorizontalSlider *horizontal_slider); }; GtkWidget* ui_skinned_horizontal_slider_new(GtkWidget *fixed, gint x, gint y, gint w, gint h, gint knx, gint kny, gint kpx, gint kpy, gint kw, gint kh, gint fh,
--- a/src/skins/ui_skinned_playlist.c Fri Jun 13 05:02:07 2008 +0300 +++ b/src/skins/ui_skinned_playlist.c Fri Jun 13 05:17:23 2008 +0300 @@ -63,11 +63,6 @@ #define UI_SKINNED_PLAYLIST_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), ui_skinned_playlist_get_type(), UiSkinnedPlaylistPrivate)) typedef struct _UiSkinnedPlaylistPrivate UiSkinnedPlaylistPrivate; -enum { - REDRAW, - LAST_SIGNAL -}; - struct _UiSkinnedPlaylistPrivate { SkinPixmapId skin_index; gint width, height; @@ -88,14 +83,12 @@ static gboolean ui_skinned_playlist_button_release (GtkWidget *widget, GdkEventButton *event); static gboolean ui_skinned_playlist_motion_notify (GtkWidget *widget, GdkEventMotion *event); static gboolean ui_skinned_playlist_leave_notify (GtkWidget *widget, GdkEventCrossing *event); -static void ui_skinned_playlist_redraw (UiSkinnedPlaylist *playlist); static gboolean ui_skinned_playlist_popup_show (gpointer data); static void ui_skinned_playlist_popup_hide (GtkWidget *widget); static void ui_skinned_playlist_popup_timer_start (GtkWidget *widget); static void ui_skinned_playlist_popup_timer_stop (GtkWidget *widget); static GtkWidgetClass *parent_class = NULL; -static guint playlist_signals[LAST_SIGNAL] = { 0 }; GType ui_skinned_playlist_get_type() { static GType playlist_type = 0; @@ -138,13 +131,6 @@ widget_class->motion_notify_event = ui_skinned_playlist_motion_notify; widget_class->leave_notify_event = ui_skinned_playlist_leave_notify; - klass->redraw = ui_skinned_playlist_redraw; - - playlist_signals[REDRAW] = - g_signal_new ("redraw", G_OBJECT_CLASS_TYPE (object_class), G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION, - G_STRUCT_OFFSET (UiSkinnedPlaylistClass, redraw), NULL, NULL, - gtk_marshal_VOID__VOID, G_TYPE_NONE, 0); - g_type_class_add_private (gobject_class, sizeof (UiSkinnedPlaylistPrivate)); } @@ -991,15 +977,6 @@ return FALSE; } -static void ui_skinned_playlist_redraw(UiSkinnedPlaylist *playlist) { - UiSkinnedPlaylistPrivate *priv = UI_SKINNED_PLAYLIST_GET_PRIVATE(playlist); - - if (priv->resize_height || priv->resize_width) - gtk_widget_set_size_request(GTK_WIDGET(playlist), priv->width+priv->resize_width, priv->height+priv->resize_height); - - gtk_widget_queue_draw(GTK_WIDGET(playlist)); -} - void ui_skinned_playlist_set_font(const gchar * font) { /* Welcome to bad hack central 2k3 */ gchar *font_lower; @@ -1052,6 +1029,7 @@ UiSkinnedPlaylistPrivate *priv = UI_SKINNED_PLAYLIST_GET_PRIVATE(widget); priv->resize_width += w; priv->resize_height += h; + gtk_widget_set_size_request(widget, priv->width+priv->resize_width, priv->height+priv->resize_height); } static gboolean ui_skinned_playlist_popup_show(gpointer data) {
--- a/src/skins/ui_skinned_playlist.h Fri Jun 13 05:02:07 2008 +0300 +++ b/src/skins/ui_skinned_playlist.h Fri Jun 13 05:17:23 2008 +0300 @@ -59,7 +59,6 @@ struct _UiSkinnedPlaylistClass { GtkWidgetClass parent_class; - void (* redraw) (UiSkinnedPlaylist *playlist); }; GtkWidget* ui_skinned_playlist_new(GtkWidget *fixed, gint x, gint y, gint w, gint h);
--- a/src/skins/ui_skinned_playlist_slider.c Fri Jun 13 05:02:07 2008 +0300 +++ b/src/skins/ui_skinned_playlist_slider.c Fri Jun 13 05:17:23 2008 +0300 @@ -31,11 +31,6 @@ #define UI_SKINNED_PLAYLIST_SLIDER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), ui_skinned_playlist_slider_get_type(), UiSkinnedPlaylistSliderPrivate)) typedef struct _UiSkinnedPlaylistSliderPrivate UiSkinnedPlaylistSliderPrivate; -enum { - REDRAW, - LAST_SIGNAL -}; - struct _UiSkinnedPlaylistSliderPrivate { SkinPixmapId skin_index; gint width, height; @@ -57,10 +52,8 @@ static gboolean ui_skinned_playlist_slider_button_press (GtkWidget *widget, GdkEventButton *event); static gboolean ui_skinned_playlist_slider_button_release (GtkWidget *widget, GdkEventButton *event); static gboolean ui_skinned_playlist_slider_motion_notify (GtkWidget *widget, GdkEventMotion *event); -static void ui_skinned_playlist_slider_redraw (UiSkinnedPlaylistSlider *playlist_slider); static GtkWidgetClass *parent_class = NULL; -static guint playlist_slider_signals[LAST_SIGNAL] = { 0 }; GType ui_skinned_playlist_slider_get_type() { static GType playlist_slider_type = 0; @@ -102,13 +95,6 @@ widget_class->button_release_event = ui_skinned_playlist_slider_button_release; widget_class->motion_notify_event = ui_skinned_playlist_slider_motion_notify; - klass->redraw = ui_skinned_playlist_slider_redraw; - - playlist_slider_signals[REDRAW] = - g_signal_new ("redraw", G_OBJECT_CLASS_TYPE (object_class), G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION, - G_STRUCT_OFFSET (UiSkinnedPlaylistSliderClass, redraw), NULL, NULL, - gtk_marshal_VOID__VOID, G_TYPE_NONE, 0); - g_type_class_add_private (gobject_class, sizeof (UiSkinnedPlaylistSliderPrivate)); } @@ -314,24 +300,17 @@ return TRUE; } -static void ui_skinned_playlist_slider_redraw(UiSkinnedPlaylistSlider *playlist_slider) { - UiSkinnedPlaylistSliderPrivate *priv = UI_SKINNED_PLAYLIST_SLIDER_GET_PRIVATE(playlist_slider); - - if (priv->resize_height) - gtk_widget_set_size_request(GTK_WIDGET(playlist_slider), priv->width, priv->height+priv->resize_height); - if (priv->move_x) - gtk_fixed_move(GTK_FIXED(gtk_widget_get_parent(GTK_WIDGET(playlist_slider))), GTK_WIDGET(playlist_slider), - playlist_slider->x+priv->move_x, playlist_slider->y); - - gtk_widget_queue_draw(GTK_WIDGET(playlist_slider)); -} - void ui_skinned_playlist_slider_move_relative(GtkWidget *widget, gint x) { + UiSkinnedPlaylistSlider *playlist_slider = UI_SKINNED_PLAYLIST_SLIDER(widget); UiSkinnedPlaylistSliderPrivate *priv = UI_SKINNED_PLAYLIST_SLIDER_GET_PRIVATE(widget); priv->move_x += x; + gtk_fixed_move(GTK_FIXED(gtk_widget_get_parent(widget)), widget, + playlist_slider->x+priv->move_x, playlist_slider->y); } void ui_skinned_playlist_slider_resize_relative(GtkWidget *widget, gint h) { + UiSkinnedPlaylistSlider *playlist_slider = UI_SKINNED_PLAYLIST_SLIDER(widget); UiSkinnedPlaylistSliderPrivate *priv = UI_SKINNED_PLAYLIST_SLIDER_GET_PRIVATE(widget); priv->resize_height += h; + gtk_widget_set_size_request(GTK_WIDGET(playlist_slider), priv->width, priv->height+priv->resize_height); }
--- a/src/skins/ui_skinned_playlist_slider.h Fri Jun 13 05:02:07 2008 +0300 +++ b/src/skins/ui_skinned_playlist_slider.h Fri Jun 13 05:17:23 2008 +0300 @@ -48,7 +48,6 @@ struct _UiSkinnedPlaylistSliderClass { GtkWidgetClass parent_class; - void (* redraw) (UiSkinnedPlaylistSlider *playlist_slider); }; GtkWidget* ui_skinned_playlist_slider_new(GtkWidget *fixed, gint x, gint y, gint h);
--- a/src/skins/ui_skinned_textbox.c Fri Jun 13 05:02:07 2008 +0300 +++ b/src/skins/ui_skinned_textbox.c Fri Jun 13 05:17:23 2008 +0300 @@ -42,7 +42,6 @@ DOUBLE_CLICKED, RIGHT_CLICKED, DOUBLED, - REDRAW, LAST_SIGNAL }; @@ -77,7 +76,6 @@ static gboolean ui_skinned_textbox_button_release (GtkWidget *widget, GdkEventButton *event); static gboolean ui_skinned_textbox_motion_notify (GtkWidget *widget, GdkEventMotion *event); static void ui_skinned_textbox_toggle_scaled (UiSkinnedTextbox *textbox); -static void ui_skinned_textbox_redraw (UiSkinnedTextbox *textbox); static gboolean ui_skinned_textbox_should_scroll (UiSkinnedTextbox *textbox); static void textbox_generate_xfont_pixmap (UiSkinnedTextbox *textbox, const gchar *pixmaptext); static gboolean textbox_scroll (gpointer data); @@ -131,7 +129,6 @@ klass->double_clicked = NULL; klass->right_clicked = NULL; klass->scaled = ui_skinned_textbox_toggle_scaled; - klass->redraw = ui_skinned_textbox_redraw; textbox_signals[CLICKED] = g_signal_new ("clicked", G_OBJECT_CLASS_TYPE (object_class), G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION, @@ -153,11 +150,6 @@ G_STRUCT_OFFSET (UiSkinnedTextboxClass, scaled), NULL, NULL, gtk_marshal_VOID__VOID, G_TYPE_NONE, 0); - textbox_signals[REDRAW] = - g_signal_new ("redraw", G_OBJECT_CLASS_TYPE (object_class), G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION, - G_STRUCT_OFFSET (UiSkinnedTextboxClass, redraw), NULL, NULL, - gtk_marshal_VOID__VOID, G_TYPE_NONE, 0); - g_type_class_add_private (gobject_class, sizeof (UiSkinnedTextboxPrivate)); } @@ -411,16 +403,6 @@ gtk_widget_queue_draw(GTK_WIDGET(textbox)); } -static void ui_skinned_textbox_redraw(UiSkinnedTextbox *textbox) { - UiSkinnedTextboxPrivate *priv = UI_SKINNED_TEXTBOX_GET_PRIVATE(textbox); - - if (priv->move_x || priv->move_y) - gtk_fixed_move(GTK_FIXED(gtk_widget_get_parent(GTK_WIDGET(textbox))), GTK_WIDGET(textbox), - textbox->x+priv->move_x, textbox->y+priv->move_y); - - gtk_widget_queue_draw(GTK_WIDGET(textbox)); -} - static gboolean ui_skinned_textbox_should_scroll(UiSkinnedTextbox *textbox) { UiSkinnedTextboxPrivate *priv = UI_SKINNED_TEXTBOX_GET_PRIVATE(textbox); @@ -866,7 +848,10 @@ } void ui_skinned_textbox_move_relative(GtkWidget *widget, gint x, gint y) { + UiSkinnedTextbox *textbox = UI_SKINNED_TEXTBOX(widget); UiSkinnedTextboxPrivate *priv = UI_SKINNED_TEXTBOX_GET_PRIVATE(widget); priv->move_x += x; priv->move_y += y; + gtk_fixed_move(GTK_FIXED(gtk_widget_get_parent(widget)), widget, + textbox->x+priv->move_x, textbox->y+priv->move_y); }
--- a/src/skins/ui_skinned_textbox.h Fri Jun 13 05:02:07 2008 +0300 +++ b/src/skins/ui_skinned_textbox.h Fri Jun 13 05:17:23 2008 +0300 @@ -54,7 +54,6 @@ void (* double_clicked) (UiSkinnedTextbox *textbox); void (* right_clicked) (UiSkinnedTextbox *textbox); void (* scaled) (UiSkinnedTextbox *textbox); - void (* redraw) (UiSkinnedTextbox *textbox); }; GtkWidget* ui_skinned_textbox_new (GtkWidget *fixed, gint x, gint y, gint w, gboolean allow_scroll, SkinPixmapId si);