Date: Sat, 7 Feb 2004 22:34:38 +0100 From: "Miguel Mendez" <flynn@energyhq.es.eu.org> To: "FreeBSD gnats submit" <FreeBSD-gnats-submit@FreeBSD.org> Subject: ports/62495: [Maintainer Update] multimedia/beep-media-player to 0.9.6.1 Message-ID: <1076189678.0@scienide.energyhq.es.eu.org> Resent-Message-ID: <200402072140.i17LeHk1020244@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 62495 >Category: ports >Synopsis: [Maintainer Update] multimedia/beep-media-player to 0.9.6.1 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Sat Feb 07 13:40:17 PST 2004 >Closed-Date: >Last-Modified: >Originator: Miguel Mendez >Release: DragonFly 1.0-CURRENT i386 >Organization: The $699 Linux distro >Environment: System: DragonFly scienide.energyhq.es.eu.org 1.0-CURRENT DragonFly 1.0-CURRENT #3: Sun F i386 >Description: Yes, 0.9.6 is newer than 1.0.0, ergo PORTEPOCH needs to be bumped. The visualization plugins menu may crash the player, but since most of the code is such a mess I'm not going to bother with it until 1.0 comes out. >How-To-Repeat: >Fix: --- beep.diff begins here --- diff -ruN beep-media-player.old/Makefile beep-media-player/Makefile --- beep-media-player.old/Makefile Wed Feb 4 06:07:48 2004 +++ beep-media-player/Makefile Sat Feb 7 22:16:54 2004 @@ -6,22 +6,23 @@ # PORTNAME= beep-media-player -PORTVERSION= 1.0.0 -PORTREVISION= 4 +PORTVERSION= 0.9.6.1 +PORTEPOCH= 1 CATEGORIES= multimedia audio -MASTER_SITES= http://linux-media.net/beep/downloads/ -DISTNAME= ${PORTNAME}-${PORTVERSION}-pre5 +MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} +MASTER_SITE_SUBDIR= beepmp +DISTNAME= bmp-${PORTVERSION} MAINTAINER= flynn@energyhq.es.eu.org COMMENT= GTK2 mp3 player LIB_DEPENDS= iconv.3:${PORTSDIR}/converters/libiconv -WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}-pre5 USE_GNOME= gtk20 WANT_GNOME= yes USE_X_PREFIX= yes USE_REINPLACE= yes +USE_LIBTOOL= yes USE_GMAKE= yes INSTALLS_SHLIB= yes GNU_CONFIGURE= yes @@ -30,7 +31,7 @@ INPUT_PLUGINS="${INPUT_PLUGINS}" \ OUTPUT_PLUGINS="${OUTPUT_PLUGINS}" \ VISUALIZATION_PLUGINS="${VISUALIZATION_PLUGINS}" -MAN1= beep.1 +MAN1= beep-media-player.1 INPUT_PLUGINS= cdaudio,mpg123 OUTPUT_PLUGINS= OSS diff -ruN beep-media-player.old/distinfo beep-media-player/distinfo --- beep-media-player.old/distinfo Sat Nov 15 03:24:06 2003 +++ beep-media-player/distinfo Sat Feb 7 17:37:27 2004 @@ -1 +1,2 @@ -MD5 (beep-media-player-1.0.0-pre5.tar.gz) = 64aa256b8e34c44e84df44ff749cd412 +MD5 (bmp-0.9.6.1.tar.gz) = 0102233416eb8efaec775c415f5308eb +SIZE (bmp-0.9.6.1.tar.gz) = 1472078 diff -ruN beep-media-player.old/files/patch-Input::cdaudio::cdaudio.c beep-media-player/files/patch-Input::cdaudio::cdaudio.c --- beep-media-player.old/files/patch-Input::cdaudio::cdaudio.c Sat Nov 15 03:24:06 2003 +++ beep-media-player/files/patch-Input::cdaudio::cdaudio.c Thu Jan 1 01:00:00 1970 @@ -1,15 +0,0 @@ ---- Input/cdaudio/cdaudio.c.orig Fri Nov 14 05:38:50 2003 -+++ Input/cdaudio/cdaudio.c Fri Nov 14 05:39:31 2003 -@@ -695,10 +695,11 @@ - struct driveinfo* cdda_find_drive(char *filename) - { - GList *node; -+ struct driveinfo *d; - - // FIXME: Will always return the first drive - node = cdda_cfg.drives; -- struct driveinfo *d = node->data; -+ d = node->data; - - for (node = cdda_cfg.drives; node; node = node->next) - { diff -ruN beep-media-player.old/files/patch-Input::mpg123::fileinfo.c beep-media-player/files/patch-Input::mpg123::fileinfo.c --- beep-media-player.old/files/patch-Input::mpg123::fileinfo.c Sat Nov 15 03:24:06 2003 +++ beep-media-player/files/patch-Input::mpg123::fileinfo.c Sat Feb 7 18:34:52 2004 @@ -1,71 +1,61 @@ ---- Input/mpg123/fileinfo.c.orig Fri Nov 14 05:40:55 2003 -+++ Input/mpg123/fileinfo.c Fri Nov 14 05:44:47 2003 -@@ -299,6 +299,8 @@ - gint i; - gchar *title; - +--- Input/mpg123/fileinfo.c.orig Sat Feb 7 18:24:23 2004 ++++ Input/mpg123/fileinfo.c Sat Feb 7 18:34:26 2004 +@@ -299,6 +299,13 @@ + { + gint i; + gchar *title; ++ GtkWidget *pixmapwid; ++ GdkPixbuf *pixbuf; ++ PangoAttribute *attr; ++ PangoAttrList *attrs; ++ GtkWidget *test_table; ++ GtkWidget *urk, *blark; + struct stat mstat; -+ - emphasis[0] = _("None"); - emphasis[1] = _("50/15 ms"); - emphasis[2] = ""; -@@ -308,6 +310,14 @@ - - if (!window) - { -+ GtkWidget * pixmapwid; -+ GdkPixbuf * pixbuf; -+ -+ PangoAttrList *attrs; -+ PangoAttribute *attr; -+ -+ GtkWidget * test_table; -+ GtkWidget *urk,*blark; - - window = gtk_window_new(GTK_WINDOW_TOPLEVEL); - gtk_window_set_policy(GTK_WINDOW(window), FALSE, FALSE, FALSE); -@@ -322,8 +332,6 @@ - filename_vbox = gtk_hbox_new(FALSE, 5); - gtk_box_pack_start(GTK_BOX(vbox), filename_vbox, FALSE, TRUE, 0); - -- GtkWidget * pixmapwid; -- GdkPixbuf * pixbuf; - pixbuf = gdk_pixbuf_new_from_xpm_data((const char **)gnome_mime_audio_xpm); - pixmapwid = gtk_image_new_from_pixbuf(pixbuf); - g_object_unref(pixbuf); -@@ -332,9 +340,6 @@ - label = gtk_label_new(NULL); + emphasis[0] = _("None"); + emphasis[1] = _("50/15 ms"); +@@ -323,8 +330,6 @@ + filename_vbox = gtk_hbox_new(FALSE, 5); + gtk_box_pack_start(GTK_BOX(vbox), filename_vbox, FALSE, TRUE, 0); + +- GtkWidget *pixmapwid; +- GdkPixbuf *pixbuf; + pixbuf = gdk_pixbuf_new_from_xpm_data((const char **) + gnome_mime_audio_xpm); + pixmapwid = gtk_image_new_from_pixbuf(pixbuf); +@@ -335,9 +340,6 @@ + + label = gtk_label_new(NULL); -- PangoAttrList *attrs; -- PangoAttribute *attr; +- PangoAttrList *attrs; +- PangoAttribute *attr; - - attrs = pango_attr_list_new (); + attrs = pango_attr_list_new(); - attr = pango_attr_weight_new (PANGO_WEIGHT_BOLD); -@@ -377,7 +382,7 @@ - //// MPEG Layer Info - - // FIXME: Obvious... -- GtkWidget * test_table = gtk_table_new(2, 10, FALSE); -+ test_table = gtk_table_new(2, 10, FALSE); - gtk_container_set_border_width(GTK_CONTAINER(test_table), 0); - gtk_container_add(GTK_CONTAINER(mpeg_box), test_table); - -@@ -437,8 +442,6 @@ - gtk_label_set_justify(GTK_LABEL(mpeg_filesize_val), GTK_JUSTIFY_LEFT ); - gtk_table_attach(GTK_TABLE(test_table), mpeg_filesize_val, 1, 2, 4, 5, GTK_FILL, GTK_FILL, 10, 2); + attr = pango_attr_weight_new(PANGO_WEIGHT_BOLD); +@@ -382,7 +384,7 @@ + //// MPEG Layer Info + + // FIXME: Obvious... +- GtkWidget *test_table = gtk_table_new(2, 10, FALSE); ++ test_table = gtk_table_new(2, 10, FALSE); + gtk_container_set_border_width(GTK_CONTAINER(test_table), 0); + gtk_container_add(GTK_CONTAINER(mpeg_box), test_table); + +@@ -457,8 +459,6 @@ + gtk_table_attach(GTK_TABLE(test_table), mpeg_filesize_val, 1, 2, 4, + 5, GTK_FILL, GTK_FILL, 10, 2); -- GtkWidget *urk,*blark; +- GtkWidget *urk, *blark; - - urk = gtk_label_new(""); - blark = gtk_label_new(""); - gtk_misc_set_alignment(GTK_MISC(urk), 1, 0.5); -@@ -683,7 +686,6 @@ - return; - } - -- struct stat mstat; - stat(filename,&mstat); - gtk_widget_set_sensitive(id3_frame, ((mstat.st_mode & S_IWRITE) == S_IWRITE ) ); - /* FIXME: Check for UID/GID too? */ + urk = gtk_label_new(""); + blark = gtk_label_new(""); + gtk_misc_set_alignment(GTK_MISC(urk), 1, 0.5); +@@ -756,7 +756,6 @@ + return; + } + +- struct stat mstat; + stat(filename, &mstat); + gtk_widget_set_sensitive(id3_frame, + ((mstat.st_mode & S_IWRITE) == S_IWRITE)); diff -ruN beep-media-player.old/files/patch-Input::mpg123::mpg123.c beep-media-player/files/patch-Input::mpg123::mpg123.c --- beep-media-player.old/files/patch-Input::mpg123::mpg123.c Thu Jan 1 01:00:00 1970 +++ beep-media-player/files/patch-Input::mpg123::mpg123.c Sat Feb 7 18:24:02 2004 @@ -0,0 +1,42 @@ +--- Input/mpg123/mpg123.c.orig Sat Feb 7 18:21:05 2004 ++++ Input/mpg123/mpg123.c Sat Feb 7 18:23:32 2004 +@@ -635,6 +635,7 @@ + gchar ** genre, guint * tracknum) + { + FILE *file; ++ int result_seek, result_read; + struct id3v1tag_t id3v1tag; + struct id3tag_t id3tag; + +@@ -669,12 +670,12 @@ + if (!id3) { + + +- int result_seek = fseek(file, -1 * sizeof(id3v1tag), SEEK_END); ++ result_seek = fseek(file, -1 * sizeof(id3v1tag), SEEK_END); + if (result_seek) + return; + + +- int result_read = fread(&id3v1tag, 1, sizeof(id3v1tag), file); ++ result_read = fread(&id3v1tag, 1, sizeof(id3v1tag), file); + if (result_read != sizeof(id3v1tag)) + return; + if (strncmp(id3v1tag.tag, "TAG", 3) != 0) +@@ -1111,6 +1112,8 @@ + + static void play_file(char *filename) + { ++ pthread_attr_t pta; ++ + memset(&fr, 0, sizeof(struct frame)); + memset(&temp_fr, 0, sizeof(struct frame)); + +@@ -1124,7 +1127,6 @@ + output_opened = FALSE; + dopause = FALSE; + +- pthread_attr_t pta; + (void) pthread_attr_init(&pta); + (void) pthread_attr_setschedpolicy(&pta, PTHREAD_INHERIT_SCHED); + (void) pthread_attr_setscope(&pta, PTHREAD_SCOPE_SYSTEM); diff -ruN beep-media-player.old/files/patch-Input::vorbis::fileinfo.c beep-media-player/files/patch-Input::vorbis::fileinfo.c --- beep-media-player.old/files/patch-Input::vorbis::fileinfo.c Thu Dec 25 20:18:00 2003 +++ beep-media-player/files/patch-Input::vorbis::fileinfo.c Sat Feb 7 19:42:32 2004 @@ -1,75 +1,79 @@ ---- Input/vorbis/fileinfo.c.orig Wed Dec 24 09:02:52 2003 -+++ Input/vorbis/fileinfo.c Wed Dec 24 09:07:28 2003 -@@ -498,6 +498,8 @@ - - static GtkWidget *filename_entry, *tag_frame; - +--- Input/vorbis/fileinfo.c.orig Sat Feb 7 19:35:28 2004 ++++ Input/vorbis/fileinfo.c Sat Feb 7 19:42:05 2004 +@@ -488,12 +488,21 @@ + + static GtkWidget *filename_entry, *tag_frame; + ++ GtkWidget *hbox, *label, *filename_hbox, *vbox, *left_vbox; ++ GtkWidget *table, *bbox, *cancel_button; ++ GtkWidget *pixmapwid; ++ GdkPixbuf *pixbuf; ++ PangoAttrList *attrs; ++ PangoAttribute *attr; ++ GtkWidget *boxx; ++ GtkImage *img; ++ GtkWidget *test_table; + struct stat mstat; + - g_free(vte.filename); - vte.filename = g_strdup(fn); - -@@ -505,6 +507,13 @@ - { - GtkWidget *hbox, *label, *filename_hbox, *vbox, *left_vbox; - GtkWidget *table, *bbox, *cancel_button; -+ GtkWidget * pixmapwid; -+ GdkPixbuf * pixbuf; -+ PangoAttrList *attrs; -+ PangoAttribute *attr; -+ GtkWidget * boxx; -+ GtkImage * img; -+ GtkWidget * test_table; - - window = gtk_window_new(GTK_WINDOW_TOPLEVEL); - gtk_window_set_policy(GTK_WINDOW(window), FALSE, FALSE, FALSE); -@@ -519,14 +528,11 @@ - filename_hbox = gtk_hbox_new(FALSE, 5); - gtk_box_pack_start(GTK_BOX(vbox), filename_hbox, FALSE, TRUE, 0); - -- GtkWidget * pixmapwid; -- GdkPixbuf * pixbuf = gdk_pixbuf_new_from_xpm_data((const char **)gnome_mime_audio_ogg_xpm); -+ pixbuf = gdk_pixbuf_new_from_xpm_data((const char **)gnome_mime_audio_ogg_xpm); - pixmapwid = gtk_image_new_from_pixbuf(pixbuf); - gtk_misc_set_alignment(GTK_MISC(pixmapwid), 0, 0); - gtk_box_pack_start(GTK_BOX(filename_hbox), pixmapwid, FALSE, FALSE, 0); - -- PangoAttrList *attrs; -- PangoAttribute *attr; + g_free(vte.filename); + vte.filename = g_strdup(fn); - attrs = pango_attr_list_new (); - -@@ -728,7 +734,6 @@ - GTK_FILL | GTK_EXPAND | GTK_SHRINK, 0, 5); + if (!window) { +- GtkWidget *hbox, *label, *filename_hbox, *vbox, *left_vbox; +- GtkWidget *table, *bbox, *cancel_button; + + window = gtk_window_new(GTK_WINDOW_TOPLEVEL); + gtk_window_set_policy(GTK_WINDOW(window), FALSE, FALSE, FALSE); +@@ -508,17 +517,13 @@ + filename_hbox = gtk_hbox_new(FALSE, 5); + gtk_box_pack_start(GTK_BOX(vbox), filename_hbox, FALSE, TRUE, 0); + +- GtkWidget *pixmapwid; +- GdkPixbuf *pixbuf = gdk_pixbuf_new_from_xpm_data((const char **) ++ pixbuf = gdk_pixbuf_new_from_xpm_data((const char **) + gnome_mime_audio_ogg_xpm); + pixmapwid = gtk_image_new_from_pixbuf(pixbuf); + gtk_misc_set_alignment(GTK_MISC(pixmapwid), 0, 0); + gtk_box_pack_start(GTK_BOX(filename_hbox), pixmapwid, FALSE, FALSE, + 0); + +- PangoAttrList *attrs; +- PangoAttribute *attr; +- + attrs = pango_attr_list_new(); + + attr = pango_attr_weight_new(PANGO_WEIGHT_BOLD); +@@ -722,7 +727,6 @@ + GTK_FILL | GTK_EXPAND | GTK_SHRINK, 0, 5); #endif -- GtkWidget * boxx; - boxx = gtk_hbutton_box_new(); - gtk_hbutton_box_set_layout_default(GTK_BUTTONBOX_SPREAD); - -@@ -746,7 +751,7 @@ - gtk_table_attach(table,boxx,0,5,6,7,GTK_FILL,0,0,8); - - rg_show_button = gtk_toggle_button_new(); -- GtkImage * img = gtk_image_new_from_stock(GTK_STOCK_GO_FORWARD, GTK_ICON_SIZE_MENU); -+ img = gtk_image_new_from_stock(GTK_STOCK_GO_FORWARD, GTK_ICON_SIZE_MENU); - gtk_container_add(rg_show_button,img); - g_signal_connect(G_OBJECT(rg_show_button), "toggled", - G_CALLBACK(rg_show_cb), NULL); -@@ -836,7 +841,7 @@ - gtk_box_set_spacing(GTK_BOX(info_box), 0); - - // FIXME: Obvious... -- GtkWidget * test_table = gtk_table_new(2, 10, FALSE); -+ test_table = gtk_table_new(2, 10, FALSE); - gtk_container_set_border_width(GTK_CONTAINER(test_table), 0); - gtk_container_add(GTK_CONTAINER(info_box), test_table); - -@@ -1068,7 +1073,6 @@ - gtk_window_set_title(GTK_WINDOW(window), tmp); - // rg_show_cb(rg_show_button, NULL); - -- struct stat mstat; - stat(fn,&mstat); - gtk_widget_set_sensitive(tag_frame, ((mstat.st_mode & S_IWRITE) == S_IWRITE ) ); - +- GtkWidget *boxx; + boxx = gtk_hbutton_box_new(); + gtk_hbutton_box_set_layout_default(GTK_BUTTONBOX_SPREAD); + +@@ -739,7 +743,7 @@ + gtk_table_attach(table, boxx, 0, 5, 6, 7, GTK_FILL, 0, 0, 8); + + rg_show_button = gtk_toggle_button_new(); +- GtkImage *img = gtk_image_new_from_stock(GTK_STOCK_GO_FORWARD, ++ img = gtk_image_new_from_stock(GTK_STOCK_GO_FORWARD, + GTK_ICON_SIZE_MENU); + gtk_container_add(rg_show_button, img); + g_signal_connect(G_OBJECT(rg_show_button), "toggled", +@@ -832,7 +836,7 @@ + gtk_box_set_spacing(GTK_BOX(info_box), 0); + + // FIXME: Obvious... +- GtkWidget *test_table = gtk_table_new(2, 10, FALSE); ++ test_table = gtk_table_new(2, 10, FALSE); + gtk_container_set_border_width(GTK_CONTAINER(test_table), 0); + gtk_container_add(GTK_CONTAINER(info_box), test_table); + +@@ -1073,7 +1077,6 @@ + gtk_window_set_title(GTK_WINDOW(window), tmp); + // rg_show_cb(rg_show_button, NULL); + +- struct stat mstat; + stat(fn, &mstat); + gtk_widget_set_sensitive(tag_frame, + ((mstat.st_mode & S_IWRITE) == S_IWRITE)); diff -ruN beep-media-player.old/files/patch-Input::vorbis::vorbis.c beep-media-player/files/patch-Input::vorbis::vorbis.c --- beep-media-player.old/files/patch-Input::vorbis::vorbis.c Thu Dec 25 20:18:00 2003 +++ beep-media-player/files/patch-Input::vorbis::vorbis.c Sat Feb 7 19:32:40 2004 @@ -1,18 +1,16 @@ ---- Input/vorbis/vorbis.c.orig Wed Dec 24 09:00:39 2003 -+++ Input/vorbis/vorbis.c Wed Dec 24 09:00:52 2003 -@@ -134,6 +134,7 @@ - FILE *stream; - OggVorbis_File vfile; /* avoid thread interaction */ - char *ext; -+ gint result; +--- Input/vorbis/vorbis.c.orig Sat Feb 7 19:26:13 2004 ++++ Input/vorbis/vorbis.c Sat Feb 7 19:32:10 2004 +@@ -521,12 +521,12 @@ + static void vorbis_play(char *filename) + { ++ pthread_attr_t pta; + vorbis_playing = 1; + vorbis_bytes_streamed = 0; + vorbis_eos = 0; + output_error = FALSE; - /* is this our http resource? */ -@@ -161,7 +162,6 @@ - memset(&vfile, 0, sizeof(vfile)); - pthread_mutex_lock(&vf_mutex); - -- gint result; - result = ov_test(stream, &vfile, NULL, 0); - - switch (result) { +- pthread_attr_t pta; + (void) pthread_attr_init(&pta); + (void) pthread_attr_setschedpolicy(&pta, PTHREAD_INHERIT_SCHED); + (void) pthread_attr_setscope(&pta, PTHREAD_SCOPE_SYSTEM); diff -ruN beep-media-player.old/files/patch-beep::dirbrowser.c beep-media-player/files/patch-beep::dirbrowser.c --- beep-media-player.old/files/patch-beep::dirbrowser.c Thu Jan 1 01:00:00 1970 +++ beep-media-player/files/patch-beep::dirbrowser.c Sat Feb 7 18:18:42 2004 @@ -0,0 +1,177 @@ +--- beep/dirbrowser.c.orig Sat Feb 7 18:04:24 2004 ++++ beep/dirbrowser.c Sat Feb 7 18:18:23 2004 +@@ -263,15 +263,17 @@ + static gchar *bmp_db_sanify_tag(gchar * value) + { + +- if (!value) +- return "(unknown)"; +- ++ GString *chunk; + gchar *frag = NULL; + gchar **branches; + guint ctr = 0; + gboolean bracket_open = FALSE; + +- GString *chunk = g_string_new(NULL); ++ if (!value) ++ return "(unknown)"; ++ ++ ++ chunk = g_string_new(NULL); + branches = g_strsplit(g_strstrip(value), " ", 0); + + while (frag || (ctr == 0)) { +@@ -346,6 +348,7 @@ + GList *list = NULL; + gboolean first = TRUE; + gchar *from_real; ++ GdkPixbuf *buf_dir, *buf_file, *buf_cda; + + from = g_locale_from_utf8(from, -1, NULL, NULL, NULL); + from_real = bmp_db_get_path_real(from, model, &parent_iter); +@@ -353,18 +356,19 @@ + + /* It's not really a waste creating both beforehand since we will + * certainly need the folder one at least once, and most probably +- * the audio one too anyway */ +- GdkPixbuf *buf_dir = gdk_pixbuf_new_from_inline(sizeof(folder_pixbuf), ++ * the audio one too anyway. ++ */ ++ buf_dir = gdk_pixbuf_new_from_inline(sizeof(folder_pixbuf), + folder_pixbuf, + TRUE, + NULL); + +- GdkPixbuf *buf_file = gdk_pixbuf_new_from_inline(sizeof(audio_pixbuf), ++ buf_file = gdk_pixbuf_new_from_inline(sizeof(audio_pixbuf), + audio_pixbuf, + TRUE, + NULL); + +- GdkPixbuf *buf_cda = gdk_pixbuf_new_from_inline(sizeof(cda_pixbuf), ++ buf_cda = gdk_pixbuf_new_from_inline(sizeof(cda_pixbuf), + cda_pixbuf, + TRUE, + NULL); +@@ -654,6 +658,7 @@ + + GtkTreeModel *model; + GtkTreeView *treeview; ++ GtkWidget *store; + + treeview = gtk_tree_selection_get_tree_view(sel); + model = gtk_tree_view_get_model(treeview); +@@ -681,7 +686,7 @@ + paths = paths->next; + } + +- GtkWidget *store = ++ store = + GTK_WIDGET(bmp_db_return_filestore_model_fresh(paths_f)); + + gtk_tree_view_set_model(user_data, GTK_TREE_MODEL(store)); +@@ -706,6 +711,7 @@ + + struct stat statbuf; + GtkTreeModel *model; ++ gboolean valid; + + model = gtk_tree_view_get_model(treeview); + paths = bmp_db_get_paths_from_selection(treeview); +@@ -735,7 +741,7 @@ + if (gtk_tree_model_iter_children(model, &iter_child, &iter)) { + if (click_play) + playlist_clear(); +- gboolean valid = TRUE; ++ valid = TRUE; + while (valid) { + gtk_tree_model_get(GTK_TREE_MODEL(model), &iter_child, + FILENAME_COL, &node_name, -1); +@@ -1308,12 +1314,15 @@ + { + + GtkTreeStore *file_store; +- ++ GtkTreeModel *sort_model; ++ gdouble length_pl, frac; ++ int ctr=0; ++ GList *files; + + file_store = + gtk_tree_store_new(5, GDK_TYPE_PIXBUF, G_TYPE_STRING, G_TYPE_INT, + G_TYPE_STRING, G_TYPE_INT); +- GtkTreeModel *sort_model = ++ sort_model = + gtk_tree_model_sort_new_with_model(GTK_TREE_MODEL(file_store)); + + +@@ -1321,17 +1330,16 @@ + bmp_db_mdb_sort_func, NULL, NULL); + + +- gdouble length_pl = g_list_length(paths); ++ length_pl = g_list_length(paths); + gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(progressbar_db), 0.0); + +- int ctr = 0; + + while (paths) { + + gchar *path = paths->data; + ctr++; + +- GList *files = bmp_db_return_files_from_path(path); ++ files = bmp_db_return_files_from_path(path); + + while (files) { + gchar *title; +@@ -1356,7 +1364,7 @@ + files = files->next; + } + +- gdouble frac = 1 / length_pl; ++ frac = 1 / length_pl; + gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(progressbar_db), + frac * ctr); + while (gtk_events_pending()) { +@@ -1411,15 +1419,17 @@ + GtkWidget *treeview = NULL; + GtkWidget *label_header; + GtkWidget *paned; ++ GtkWidget *fstore; ++ GList *paths = NULL; ++ PangoAttrList *attrs; ++ PangoAttribute *attr; ++ GtkTreeSelection *sel; + + if (!window) { + + /* create window, etc */ + /* yes this is all messed up */ + +- PangoAttrList *attrs; +- PangoAttribute *attr; +- + window = gtk_window_new(GTK_WINDOW_TOPLEVEL); + gtk_window_set_title(GTK_WINDOW(window), "bmp :: Add Files..."); + gtk_container_set_border_width(GTK_CONTAINER(window), 8); +@@ -1489,17 +1499,15 @@ + G_CALLBACK(bmp_db_keypress), window); + + gtk_container_add(GTK_CONTAINER(sw), treeview); +- GtkWidget *fstore; + + /* FIXME: clean up variables, move them to start */ + + /* FIXME: paths is not freed, and is resetted every iteration */ +- GList *paths = NULL; + paths = g_list_append(paths, g_strdup(g_get_home_dir())); + fstore = bmp_db_return_filestore_fresh(paths); + gtk_container_add(GTK_CONTAINER(sw_right), fstore); + +- GtkTreeSelection *sel = ++ sel = + gtk_tree_view_get_selection(GTK_TREE_VIEW(treeview)); + g_signal_connect(G_OBJECT(sel), "changed", + G_CALLBACK(bmp_db_row_activated), fstore); diff -ruN beep-media-player.old/files/patch-beep::main.c beep-media-player/files/patch-beep::main.c --- beep-media-player.old/files/patch-beep::main.c Sun Nov 16 19:00:06 2003 +++ beep-media-player/files/patch-beep::main.c Thu Jan 1 01:00:00 1970 @@ -1,25 +0,0 @@ ---- beep/main.c.orig Sat Nov 15 21:33:27 2003 -+++ beep/main.c Sat Nov 15 21:35:22 2003 -@@ -1634,7 +1634,7 @@ - - if (treeview->selection) - { -- pos = gtk_treeview_get_row_data(treeview, GPOINTER_TO_INT(treeview->selection->data)); -+// pos = gtk_treeview_get_row_data(treeview, GPOINTER_TO_INT(treeview->selection->data)); - playlist_queue_position(*pos); - gtk_widget_set(GTK_WIDGET(widget), "label", playlist_is_position_queued(*pos) ? "Unqueue" : "Queue", NULL); - } -@@ -2030,11 +2030,12 @@ - - - if (!strncasecmp(path,"fonts:///",9)) { -+ gchar * decoded; - path[strlen(path)-2] = 0; /* Why the hell a CR&LF? */ - path = path + 8; - - /* plain, since we already stripped the first URI part */ -- gchar * decoded = xmms_urldecode_plain(path); -+ decoded = xmms_urldecode_plain(path); - decoded++; - - /* Get the old font's size, and add it to the dropped font's name */ diff -ruN beep-media-player.old/files/patch-beep::output.c beep-media-player/files/patch-beep::output.c --- beep-media-player.old/files/patch-beep::output.c Sat Nov 15 03:24:06 2003 +++ beep-media-player/files/patch-beep::output.c Thu Jan 1 01:00:00 1970 @@ -1,20 +0,0 @@ ---- beep/output.c.orig Fri Nov 14 05:21:23 2003 -+++ beep/output.c Fri Nov 14 05:21:52 2003 -@@ -31,14 +31,15 @@ - { - gint time; - gint pos; -- -+ gboolean playing; -+ - GList *node = g_list_nth(op_data->output_list, i); - if (node) - op_data->current_output_plugin = node->data; - else - op_data->current_output_plugin = NULL; - -- gboolean playing = get_input_playing(); -+ playing = get_input_playing(); - if (playing) { - - /* FIXME: we do all on our own here */ diff -ruN beep-media-player.old/files/patch-beep::playlist.c beep-media-player/files/patch-beep::playlist.c --- beep-media-player.old/files/patch-beep::playlist.c Sat Nov 15 03:24:06 2003 +++ beep-media-player/files/patch-beep::playlist.c Thu Jan 1 01:00:00 1970 @@ -1,149 +0,0 @@ ---- beep/playlist.c.orig Fri Nov 14 06:25:26 2003 -+++ beep/playlist.c Fri Nov 14 06:34:23 2003 -@@ -607,6 +607,7 @@ - - while (*string) - { -+ GList *node; - temp = strchr(string, '\n'); - if (temp) - { -@@ -633,7 +634,6 @@ - } - } - -- GList *node; - node = g_list_nth(get_playlist(), pos); - - entries += i; -@@ -2346,6 +2346,7 @@ - guint64 node_idx; - gchar * from_real; - gboolean error; -+ db_node * node; - - /* It's not really a waste creating both beforehand since we will certainly need the folder one at least once, - and most probably the audio one too anyway */ -@@ -2366,7 +2367,6 @@ - - current = gtk_tree_model_get_path(model, &parent_iter); - node_idx = dirbrowser_get_nodeidx_from_iter(model, &parent_iter, 0, &error); -- db_node * node; - node = g_ptr_array_index(nodes, node_idx); - from_real = g_strconcat(node->path_real,"/",from,NULL); - -@@ -2388,10 +2388,11 @@ - { - while ((dirent = readdir(dir)) != NULL) - { -+ char * name_real; - // FIXME: Excludes hidden dirs too (do we want them anyway?) - if (dirent->d_name[0] == '.') - continue; -- char * name_real = g_strdup(g_strconcat(from_real,"/",dirent->d_name,NULL)); -+ name_real = g_strdup(g_strconcat(from_real,"/",dirent->d_name,NULL)); - stat(name_real, &statbuf); - - if ( S_ISDIR(statbuf.st_mode) ) { -@@ -2513,9 +2514,10 @@ - char *buffer, **lines, **frags; - struct stat stats; - guint i; -- -+ GdkPixbuf * buf; -+ - model = gtk_tree_store_new(2, GDK_TYPE_PIXBUF, G_TYPE_STRING); -- GdkPixbuf * buf = gdk_pixbuf_new_from_inline(sizeof(harddisk_pixbuf), -+ buf = gdk_pixbuf_new_from_inline(sizeof(harddisk_pixbuf), - harddisk_pixbuf, - TRUE, - NULL); -@@ -2803,13 +2805,16 @@ - - PangoAttrList *attrs; - PangoAttribute *attr; -+ -+ GdkPixbuf * buf; -+ - attrs = pango_attr_list_new (); - attr = pango_attr_weight_new (PANGO_WEIGHT_BOLD); - attr->start_index = 0; - attr->end_index = -1; - pango_attr_list_insert (attrs, attr); - -- GdkPixbuf * buf = gdk_pixbuf_new_from_inline(sizeof(harddisk_pixbuf), -+ buf = gdk_pixbuf_new_from_inline(sizeof(harddisk_pixbuf), - harddisk_pixbuf, - TRUE, - NULL); -@@ -2863,9 +2868,10 @@ - if ( S_ISDIR(statbuf.st_mode) ) { - - db_node * node; -- node = g_malloc0(sizeof(db_node)); - char * dir = g_strdup(path_real); - char * name = g_strdup(path_real); -+ -+ node = g_malloc0(sizeof(db_node)); - node->path_real = dir; - - gtk_label_set_text(variable, g_strdup(g_strconcat("Choose a Name for:\n",name,NULL))); -@@ -2932,9 +2938,9 @@ - (model, - &iter, - gtk_tree_path_to_string(paths->data))) { -+ db_node * node; - gtk_tree_store_remove (GTK_TREE_STORE(model), &iter); - -- db_node * node; - node = g_ptr_array_index(nodes, node_idx); - g_ptr_array_remove_index(nodes, node_idx); - ctr_array--; -@@ -3178,7 +3184,11 @@ - /* create window, etc */ - - /* yes this is all messed up */ -- -+ GSList * group; -+ GtkWidget * hbox_default_setting; -+ PangoAttrList *attrs; -+ PangoAttribute *attr; -+ - window = gtk_window_new (GTK_WINDOW_TOPLEVEL); - gtk_window_set_title (GTK_WINDOW (window), "beep :: directory browser"); - gtk_container_set_border_width(GTK_CONTAINER(window), -@@ -3195,8 +3205,6 @@ - - vbox = gtk_vbox_new (FALSE, 0); - -- PangoAttrList *attrs; -- PangoAttribute *attr; - attrs = pango_attr_list_new (); - attr = pango_attr_weight_new (PANGO_WEIGHT_BOLD); - attr->start_index = 0; -@@ -3235,8 +3243,6 @@ - hbox = gtk_hbox_new (FALSE, 0); - gtk_box_pack_start(GTK_BOX(vbox),hbox,FALSE,FALSE, 0); - -- GSList * group; -- - rb_enq = gtk_radio_button_new(NULL); - group = gtk_radio_button_get_group(rb_enq); - rb_play = gtk_radio_button_new(group); -@@ -3257,7 +3263,6 @@ - - gtk_misc_set_alignment(GTK_MISC(label_rb), 0.0, 0.0); - -- gtk_label_set_attributes (GTK_LABEL(label_rb), attrs); - - gtk_container_add(GTK_CONTAINER (frame),vbox); - gtk_box_pack_start(GTK_BOX (vbox_main), frame,TRUE,TRUE,0); -@@ -3287,7 +3292,7 @@ - - hbox_lower = gtk_hbox_new(FALSE, 8); - -- GtkWidget * hbox_default_setting = gtk_hbox_new(FALSE,8); -+ hbox_default_setting = gtk_hbox_new(FALSE,8); - - gtk_box_pack_start(GTK_BOX(hbox_default_setting), table_rb,FALSE,FALSE,0); - gtk_box_pack_start(GTK_BOX(hbox_default_setting), gtk_vseparator_new(), FALSE,FALSE,0); diff -ruN beep-media-player.old/files/patch-beep::playlist_list.c beep-media-player/files/patch-beep::playlist_list.c --- beep-media-player.old/files/patch-beep::playlist_list.c Sat Nov 15 03:24:06 2003 +++ beep-media-player/files/patch-beep::playlist_list.c Sat Feb 7 17:55:37 2004 @@ -1,47 +1,19 @@ ---- beep/playlist_list.c.orig Fri Nov 14 05:24:54 2003 -+++ beep/playlist_list.c Fri Nov 14 05:28:24 2003 -@@ -292,6 +292,8 @@ - int len; - int pix_len; - char *tmp; -+ guint padding, plist_length_int; -+ PangoLayout * layout; +--- beep/playlist_list.c.orig Sat Feb 7 17:53:46 2004 ++++ beep/playlist_list.c Sat Feb 7 17:54:59 2004 +@@ -372,6 +372,7 @@ + gint i, tw, max_first; + guint padding; + guint max_time_len = 0; ++ gchar **frags; - if (cfg.convert_underscore) - while ((tmp = strchr(text, '_')) != NULL) -@@ -318,9 +320,6 @@ - pix_len = (width_approx_letters * len); - } + gc = pl->pl_widget.gc; + width = pl->pl_widget.width; +@@ -507,7 +508,7 @@ -- -- guint padding, plist_length_int; -- PangoLayout * layout; - if (cfg.show_numbers_in_pl) { -@@ -442,12 +441,13 @@ - { - int x, y; - gchar * tail; -- -+ guint t_width; -+ guint len_tail; -+ guint len; -+ - tail = g_strdup_printf("%s%s",qstr,length); +- gchar **frags = g_strsplit(tail, ":", 0); ++ frags = g_strsplit(tail, ":", 0); - if (strlen(tail) > max_time_len) max_time_len = strlen(tail); -- guint t_width; -- guint len_tail; - - /* FIXME: This is just an approximate alignment, maybe - something still fast, but exact could be done */ -@@ -485,7 +485,7 @@ - else - gdk_gc_set_foreground(gc, get_skin_color(SKIN_PLEDIT_NORMAL)); - -- guint len = strlen(tail); -+ len = strlen(tail); - - layout = gtk_widget_create_pango_layout(GTK_WIDGET(playlistwin),tail); - pango_layout_set_font_description (layout, playlist_list_font); + layout = + gtk_widget_create_pango_layout(GTK_WIDGET(playlistwin), diff -ruN beep-media-player.old/files/patch-beep::pluginenum.c beep-media-player/files/patch-beep::pluginenum.c --- beep-media-player.old/files/patch-beep::pluginenum.c Thu Jan 1 01:00:00 1970 +++ beep-media-player/files/patch-beep::pluginenum.c Sat Feb 7 22:09:04 2004 @@ -0,0 +1,18 @@ +--- beep/pluginenum.c.orig Wed Dec 24 15:03:17 2003 ++++ beep/pluginenum.c Sat Feb 7 22:08:41 2004 +@@ -238,6 +238,7 @@ + + + #ifndef DISABLE_USER_PLUGIN_DIR ++if(0) { + dir = g_build_filename(g_get_home_dir(), BMP_RCPATH, "plugins"); + bmp_scan_plugins(dir); + g_free(dir); +@@ -259,6 +260,7 @@ + g_free(dir); + } + dirsel = 0; ++} + #endif + + while (plugin_dir_list[dirsel]) { diff -ruN beep-media-player.old/files/patch-beep::prefswin.c beep-media-player/files/patch-beep::prefswin.c --- beep-media-player.old/files/patch-beep::prefswin.c Sat Nov 15 03:24:06 2003 +++ beep-media-player/files/patch-beep::prefswin.c Thu Jan 1 01:00:00 1970 @@ -1,43 +0,0 @@ ---- beep/prefswin.c.orig Fri Nov 14 05:33:05 2003 -+++ beep/prefswin.c Fri Nov 14 05:36:04 2003 -@@ -752,11 +752,15 @@ - GtkObject *options_mouse_adj; - GtkWidget *prefswin_title_desc, *prefswin_title_label, *opt; - -+ GtkWidget *table_rb; -+ GtkWidget *label; -+ - char *titles[1]; - - PangoAttrList *attrs; - PangoAttribute *attr; - -+ PangoFontDescription * playlist_list_font; - - prefswin = gtk_window_new(GTK_WINDOW_TOPLEVEL); - gtk_window_set_position(GTK_WINDOW(prefswin),GTK_WIN_POS_CENTER); -@@ -1019,7 +1023,6 @@ - gtk_container_add(GTK_CONTAINER(prefswin_options_frame), options_table); - gtk_container_border_width(GTK_CONTAINER(options_table), 5); - -- GtkWidget * table_rb; - table_rb = gtk_table_new(4,4,FALSE); - - options_gi_box = gtk_hbox_new(FALSE, 3); -@@ -1110,7 +1113,6 @@ - prefswin_fonts_vbox = gtk_table_new(4,4,TRUE); - - // This ain't exactly GnomeFontPicker, but we're not a GNOME app so no GNOME widgets for us -- GtkWidget *label; - label = gtk_label_new("Playlist Font:"); - - attrs = pango_attr_list_new (); -@@ -1126,7 +1128,7 @@ - - prefswin_options_font_browse = gtk_button_new(); - label_font = gtk_label_new(cfg.playlist_font); -- PangoFontDescription * playlist_list_font = pango_font_description_from_string (cfg.playlist_font); -+ playlist_list_font = pango_font_description_from_string (cfg.playlist_font); - gtk_widget_modify_font(label_font, playlist_list_font); - gtk_container_add(GTK_CONTAINER(prefswin_options_font_browse), label_font); - diff -ruN beep-media-player.old/files/patch-beep::skin.c beep-media-player/files/patch-beep::skin.c --- beep-media-player.old/files/patch-beep::skin.c Thu Jan 1 01:00:00 1970 +++ beep-media-player/files/patch-beep::skin.c Sat Feb 7 17:46:57 2004 @@ -0,0 +1,42 @@ +--- beep/skin.c.orig Sat Feb 7 17:42:34 2004 ++++ beep/skin.c Sat Feb 7 17:46:18 2004 +@@ -168,6 +168,7 @@ + const SMID_Mapping *sm_inf; + GdkPixmap *gpm; + gboolean retval = FALSE; ++ SkinPixmap *pm; + + if (id >= SKIN_PMID_LAST) { + g_warning("skin pixmap id out of range (%u).", id); +@@ -201,7 +202,7 @@ + } + g_free(tmpstr); + +- SkinPixmap *pm = &sk->pixmaps[id]; ++ pm = &sk->pixmaps[id]; + gpm = read_bmp(filename); + + if (!gpm) { +@@ -733,9 +734,9 @@ + GdkBitmap *skin_get_mask(MaskIndex mi, gboolean doublesize, + gboolean shaded) + { ++ GdkBitmap **masks; + g_assert(skin != NULL); + +- GdkBitmap **masks; + + g_assert(mi < SKIN_MID_LAST); + masks = (doublesize ? skin->ds_masks : skin->masks); +@@ -813,8 +814,10 @@ + gint i; + GdkPixmap *pixmap; + GdkImage *img; ++ SkinPixmap *eqmainpm; ++ + g_assert(skin != NULL); +- SkinPixmap *eqmainpm = &skin->pixmaps[SKIN_EQMAIN]; ++ eqmainpm = &skin->pixmaps[SKIN_EQMAIN]; + if (eqmainpm->pixmap != NULL && + eqmainpm->current_width >= 116 && eqmainpm->current_height >= 313) + pixmap = eqmainpm->pixmap; diff -ruN beep-media-player.old/files/patch-beep::skinwin.c beep-media-player/files/patch-beep::skinwin.c --- beep-media-player.old/files/patch-beep::skinwin.c Sat Nov 15 03:24:06 2003 +++ beep-media-player/files/patch-beep::skinwin.c Sat Feb 7 18:18:09 2004 @@ -1,42 +1,18 @@ ---- beep/skinwin.c.orig Fri Nov 14 05:30:38 2003 -+++ beep/skinwin.c Fri Nov 14 05:32:30 2003 -@@ -190,6 +190,10 @@ - GtkTreeView * treeview = GTK_TREE_VIEW(data); - GtkListStore * model; - GtkTreeSelection * l_selection; -+ guint max; -+ guint loop; -+ char * comp; -+ - - /* FIXME: - * This is all alittle of bad mojo here, the gtk-doc says about the "changed" signal for GtkTreeSelection: -@@ -202,10 +206,6 @@ - if (!gtk_tree_selection_get_selected(GTK_TREE_SELECTION(l_selection),&model,&iter)) return; - gtk_tree_model_get (GTK_TREE_MODEL(model), &iter, 1, &name, -1); +--- beep/skinwin.c.orig Sat Feb 7 18:16:37 2004 ++++ beep/skinwin.c Sat Feb 7 18:17:50 2004 +@@ -216,11 +216,12 @@ + int i; + char *str, *skinsdir; + gchar **list; ++ GtkTreeView *treeview; ++ GtkTreeSelection *selection = NULL; ++ GtkListStore *store; -- guint max; -- guint loop; -- char * comp; -- - max = g_list_length(skinlist); + gtk_widget_set_sensitive(scrolled_win, FALSE); +- GtkTreeView *treeview = GTK_TREE_VIEW(data); +- GtkTreeSelection *selection = NULL; +- GtkListStore *store; ++ treeview = GTK_TREE_VIEW(data); - for (loop = 0; loop < max; loop++) { -@@ -423,6 +423,8 @@ - GtkListStore *store; - GtkTreeModel *model; - -+ GtkWidget *selection; -+ - skinwin = gtk_window_new(GTK_WINDOW_TOPLEVEL); - gtk_widget_set_usize(skinwin,500,380); - gtk_window_set_position(GTK_WINDOW(skinwin),GTK_WIN_POS_CENTER); -@@ -493,7 +495,7 @@ - gtk_tree_view_column_set_spacing(column, 16); - gtk_tree_view_column_set_attributes (column, renderer, "text", 1, NULL); - -- GtkWidget *selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (treeview)); -+ selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (treeview)); - g_signal_connect(G_OBJECT(selection), "changed", G_CALLBACK(change_skin_event), treeview); - g_signal_connect(G_OBJECT(skinwin), "key_press_event", G_CALLBACK(skinwin_keypress_cb), NULL); - g_signal_connect(G_OBJECT(skinwin), "show",G_CALLBACK(update_skins),treeview); + selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(treeview)); + store = GTK_LIST_STORE(gtk_tree_view_get_model(treeview)); diff -ruN beep-media-player.old/files/patch-beep::softvolume.c beep-media-player/files/patch-beep::softvolume.c --- beep-media-player.old/files/patch-beep::softvolume.c Thu Jan 1 01:00:00 1970 +++ beep-media-player/files/patch-beep::softvolume.c Sat Feb 7 18:20:25 2004 @@ -0,0 +1,16 @@ +--- beep/softvolume.c.orig Sat Feb 7 18:18:57 2004 ++++ beep/softvolume.c Sat Feb 7 18:20:03 2004 +@@ -27,11 +27,12 @@ + void soft_volume_load(char *section, SoftVolumeConfig * c) + { + ConfigFile *cfgfile; ++ char *sec; + + if (c == NULL) + return; + +- char *sec = (section == NULL ? "xmms" : section); ++ sec = (section == NULL ? "xmms" : section); + + c->enabled = FALSE; + c->volume_left = 0; diff -ruN beep-media-player.old/files/patch-beep::textbox.c beep-media-player/files/patch-beep::textbox.c --- beep-media-player.old/files/patch-beep::textbox.c Thu Jan 1 01:00:00 1970 +++ beep-media-player/files/patch-beep::textbox.c Sat Feb 7 17:50:30 2004 @@ -0,0 +1,15 @@ +--- beep/textbox.c.orig Sat Feb 7 17:49:22 2004 ++++ beep/textbox.c Sat Feb 7 17:49:58 2004 +@@ -142,9 +142,9 @@ + + void textbox_set_text(TextBox * tb, gchar * text) + { +- +- lock_widget(tb); +- gchar *utf8text; ++ gchar *utf8text; ++ ++ lock_widget(tb); + if (tb->tb_text) { + if (!strcmp(text, tb->tb_text)) { + unlock_widget(tb); diff -ruN beep-media-player.old/files/patch-beep::util.c beep-media-player/files/patch-beep::util.c --- beep-media-player.old/files/patch-beep::util.c Sat Nov 15 03:24:06 2003 +++ beep-media-player/files/patch-beep::util.c Thu Jan 1 01:00:00 1970 @@ -1,75 +0,0 @@ ---- beep/util.c.orig Fri Nov 14 05:06:54 2003 -+++ beep/util.c Fri Nov 14 05:21:01 2003 -@@ -707,9 +707,11 @@ - - static void filebrowser_add_files(gchar** files, GtkFileSelection * filesel) - { -+ int ctr = 0; -+ char * ptr; -+ - if (GTK_IS_WIDGET(mainwin_jtf)) gtk_widget_set_sensitive(mainwin_jtf,FALSE); - -- int ctr = 0; - while(files[ctr] != NULL) { - playlist_add(files[ctr++]); - } -@@ -717,7 +719,6 @@ - - if (GTK_IS_WIDGET(mainwin_jtf)) gtk_widget_set_sensitive(mainwin_jtf,TRUE); - -- char * ptr; - gtk_label_get(GTK_LABEL(GTK_BIN(filesel->history_pulldown)->child), &ptr); - - /* This will give an extra slash if the current dir is the root. */ -@@ -726,19 +727,23 @@ - - static void filebrowser_ok(GtkWidget * w, GtkWidget * filesel) - { -+ gchar** files; -+ - if (util_filebrowser_is_dir(GTK_FILE_SELECTION(filesel))) - return; -- gchar** files = gtk_file_selection_get_selections(GTK_FILE_SELECTION(filesel)); -+ files = gtk_file_selection_get_selections(GTK_FILE_SELECTION(filesel)); - filebrowser_add_files(files,GTK_FILE_SELECTION(filesel)); - gtk_widget_destroy(filesel); - } - - static void filebrowser_play(GtkWidget * w, GtkWidget * filesel) - { -+ gchar** files; -+ - if (util_filebrowser_is_dir(GTK_FILE_SELECTION(GTK_FILE_SELECTION(filesel)))) - return; - playlist_clear(); -- gchar** files = gtk_file_selection_get_selections(GTK_FILE_SELECTION(filesel)); -+ files = gtk_file_selection_get_selections(GTK_FILE_SELECTION(filesel)); - filebrowser_add_files(files,GTK_FILE_SELECTION(filesel)); - gtk_widget_destroy(filesel); - playlist_play(); -@@ -746,8 +751,10 @@ - - static void filebrowser_add_selected_files(GtkWidget * w, gpointer data) - { -+ gchar** files; -+ - GtkFileSelection *filesel = GTK_FILE_SELECTION(data); -- gchar** files = gtk_file_selection_get_selections(filesel); -+ files = gtk_file_selection_get_selections(filesel); - - filebrowser_add_files(files,filesel); - gtk_tree_selection_unselect_all(gtk_tree_view_get_selection(GTK_TREE_VIEW(filesel->file_list))); -@@ -758,10 +765,12 @@ - - static void filebrowser_add_all_files(GtkWidget * w, gpointer data) - { -+ gchar** files; - GtkFileSelection * filesel; -+ - filesel = data; - gtk_tree_selection_select_all(gtk_tree_view_get_selection(GTK_TREE_VIEW(filesel->file_list))); -- gchar** files = gtk_file_selection_get_selections(filesel); -+ files = gtk_file_selection_get_selections(filesel); - filebrowser_add_files(files,filesel); - gtk_tree_selection_unselect_all(gtk_tree_view_get_selection(GTK_TREE_VIEW(filesel->file_list))); - gtk_entry_set_text(GTK_ENTRY(filesel->selection_entry), ""); diff -ruN beep-media-player.old/files/patch-ltmain.sh beep-media-player/files/patch-ltmain.sh --- beep-media-player.old/files/patch-ltmain.sh Sat Nov 15 03:24:06 2003 +++ beep-media-player/files/patch-ltmain.sh Thu Jan 1 01:00:00 1970 @@ -1,51 +0,0 @@ ---- ltmain.sh.orig Fri Nov 14 05:04:28 2003 -+++ ltmain.sh Fri Nov 14 05:04:28 2003 -@@ -1075,7 +1075,7 @@ - esac - elif test "X$arg" = "X-lc_r"; then - case $host in -- *-*-openbsd* | *-*-freebsd*) -+ *-*-openbsd* | *-*-freebsd4*) - # Do not include libc_r directly, use -pthread flag. - continue - ;; -@@ -1085,8 +1085,16 @@ - continue - ;; - -+ -pthread) -+ compile_command="$compile_command -pthread" -+ finalize_command="$finalize_command -pthread" -+ compiler_flags="$compiler_flags -pthread" -+ continue -+ ;; -+ - -module) - module=yes -+ build_old_libs=no - continue - ;; - -@@ -2506,6 +2514,9 @@ - *-*-openbsd* | *-*-freebsd*) - # Do not include libc due to us having libc/libc_r. - ;; -+ *-*-freebsd*) -+ # FreeBSD doesn't need this... -+ ;; - *) - # Add libc to deplibs on all other systems if necessary. - if test $build_libtool_need_lc = "yes"; then -@@ -4333,10 +4344,12 @@ - fi - - # Install the pseudo-library for information purposes. -+ if /usr/bin/false; then - name=`$echo "X$file" | $Xsed -e 's%^.*/%%'` - instname="$dir/$name"i - $show "$install_prog $instname $destdir/$name" - $run eval "$install_prog $instname $destdir/$name" || exit $? -+ fi - - # Maybe install the static library, too. - test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library" diff -ruN beep-media-player.old/pkg-descr beep-media-player/pkg-descr --- beep-media-player.old/pkg-descr Thu Nov 13 20:54:51 2003 +++ beep-media-player/pkg-descr Sat Feb 7 22:16:22 2004 @@ -2,4 +2,4 @@ The primary goals of this fork are UI enhancements with latest technology (GTK2, Pango), and usability while maintaining the skinned UI. -WWW: http://linux-media.net/beep/ +WWW: http://beepmp.sourceforge.net/ diff -ruN beep-media-player.old/pkg-plist beep-media-player/pkg-plist --- beep-media-player.old/pkg-plist Thu Dec 25 20:18:00 2003 +++ beep-media-player/pkg-plist Sat Feb 7 20:02:04 2004 @@ -4,24 +4,58 @@ include/beep/configfile.h include/beep/dirbrowser.h include/beep/formatter.h -include/beep/fullscreen.h -include/beep/plugin.h +include/bmp/fullscreen.h +include/bmp/plugin.h include/beep/titlestring.h include/beep/util.h lib/libbeep.a +lib/libbeep.la lib/libbeep.so lib/libbeep.so.1 -lib/beep/Input/libcdaudio.so -lib/beep/Input/libmpg123.so -%%VORBISPLUGIN:%%lib/beep/Input/libvorbis.so -lib/beep/Output/libOSS.so -%%ESDPLUGIN:%%lib/beep/Output/libesdout.so -lib/beep/Visualization/libbscope.so +lib/bmp/Input/libcdaudio.so +lib/bmp/Input/libcdaudio.la +lib/bmp/Input/libmpg123.so +lib/bmp/Input/libmpg123.la +%%VORBISPLUGIN:%%lib/bmp/Input/libvorbis.so +%%VORBISPLUGIN:%%lib/bmp/Input/libvorbis.la +lib/bmp/Output/libOSS.so +lib/bmp/Output/libOSS.la +%%ESDPLUGIN:%%lib/bmp/Output/libesdout.so +%%ESDPLUGIN:%%lib/bmp/Output/libesdout.la +lib/bmp/Visualization/libbscope.so +lib/bmp/Visualization/libbscope.la +lib/pkgconfig/beep.pc share/aclocal/beep.m4 -@dirrm share/beep/Skins -@dirrm share/beep -@dirrm lib/beep/Visualization -@dirrm lib/beep/Output -@dirrm lib/beep/Input -@dirrm lib/beep +share/bmp/Skins/Default/Avs.bmp +share/bmp/Skins/Default/Balance.bmp +share/bmp/Skins/Default/Eq_ex.bmp +share/bmp/Skins/Default/Eqmain.bmp +share/bmp/Skins/Default/Main.bmp +share/bmp/Skins/Default/Mb.bmp +share/bmp/Skins/Default/Monoster.bmp +share/bmp/Skins/Default/Nums_ex.bmp +share/bmp/Skins/Default/Pledit.bmp +share/bmp/Skins/Default/Posbar.bmp +share/bmp/Skins/Default/Shufrep.bmp +share/bmp/Skins/Default/Text.bmp +share/bmp/Skins/Default/Titlebar.bmp +share/bmp/Skins/Default/Volume.bmp +share/bmp/Skins/Default/cButtons.bmp +share/bmp/Skins/Default/pLaypaus.bmp +share/bmp/Skins/Default/pLedit.txt +share/bmp/Skins/Default/readme.txt +share/bmp/Skins/Default/screenshot.bmp +share/bmp/Skins/Default/vIscolor.txt +share/bmp/beep_logo.xpm +share/bmp/beep.svg +share/applications/beep.desktop +share/locale/fr/LC_MESSAGES/bmp.mo +@dirrm share/bmp/Skins/Default +@dirrm share/bmp/Skins +@dirrm share/bmp +@dirrm lib/bmp/Visualization +@dirrm lib/bmp/Output +@dirrm lib/bmp/Input +@dirrm lib/bmp +@dirrm include/bmp @dirrm include/beep --- beep.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?1076189678.0>