Attachment #39681 for bug #62495

View | Details | Raw Unified | Return to bug 62495
Collapse All | Expand All




#

PORTNAME=	beep-media-player
PORTVERSION=	0.9.6.1
PORTEPOCH=	1
CATEGORIES=	multimedia audio
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

		INPUT_PLUGINS="${INPUT_PLUGINS}" \
		OUTPUT_PLUGINS="${OUTPUT_PLUGINS}" \
		VISUALIZATION_PLUGINS="${VISUALIZATION_PLUGINS}"
MAN1=		beep-media-player.1

INPUT_PLUGINS=	cdaudio,mpg123
OUTPUT_PLUGINS=	OSS

Line 1 Link Here

(-)beep-media-player/distinfo (-1 / +2 lines)
1	MD5 (beep-media-player-1.0.0-pre5.tar.gz) = 64aa256b8e34c44e84df44ff749cd412	1	MD5 (bmp-0.9.6.1.tar.gz) = 0102233416eb8efaec775c415f5308eb
		2	SIZE (bmp-0.9.6.1.tar.gz) = 1472078




--- 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)
 	{




--- 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 @@
 
     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;
-
 	attrs = pango_attr_list_new();
 
 	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;
-
 	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));




--- 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);




--- 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;
 
     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);
 
@@ -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));




--- 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 @@
 	FILE *stream;
 	OggVorbis_File vfile; /* avoid thread interaction */
 	char *ext;
+	gint result;
 
 static void vorbis_play(char *filename)
 {
+	 pthread_attr_t pta;
     vorbis_playing = 1;
     vorbis_bytes_streamed = 0;
     vorbis_eos = 0;
     output_error = 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);
 
-	gint result;
 	result = ov_test(stream, &vfile, NULL, 0);
 
 	switch (result) {




--- 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);




--- 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 */




--- 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 */




--- 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);




--- 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;
+	PangoLayout * layout;
 
     gc = pl->pl_widget.gc;
     width = pl->pl_widget.width;
@@ -507,7 +508,7 @@
 		pix_len = (width_approx_letters * len);
 	}
 
-
-	guint padding, plist_length_int;
-	PangoLayout * layout;
 	if (cfg.show_numbers_in_pl) {
 
 
-	    gchar **frags = g_strsplit(tail, ":", 0);
+	    frags = g_strsplit(tail, ":", 0);
 			int x, y;
 			gchar * tail;
-
+			guint t_width;
+			guint len_tail;
+			guint len;
+			
 			tail = g_strdup_printf("%s%s",qstr,length);
 
 	    layout =
 		gtk_widget_create_pango_layout(GTK_WIDGET(playlistwin),
-			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); 




--- 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]) {




--- 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);
 




--- 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;




--- 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;
+
 	
 	/* 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);
 
     gtk_widget_set_sensitive(scrolled_win, FALSE);
-    GtkTreeView *treeview = GTK_TREE_VIEW(data);
-    GtkTreeSelection *selection = NULL;
-    GtkListStore *store;
+    treeview = GTK_TREE_VIEW(data);
 
     selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(treeview));
     store = GTK_LIST_STORE(gtk_tree_view_get_model(treeview));
 	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);




--- 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;




--- 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);




--- 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), "");




--- 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"

Lines 2-5 Link Here

(-)beep-media-player/pkg-descr (-1 / +1 lines)
2	The primary goals of this fork are UI enhancements with latest	2	The primary goals of this fork are UI enhancements with latest
3	technology (GTK2, Pango), and usability while maintaining the skinned UI.	3	technology (GTK2, Pango), and usability while maintaining the skinned UI.
4		4
5	WWW: http://linux-media.net/beep/	5	WWW: http://beepmp.sourceforge.net/




include/beep/configfile.h
include/beep/dirbrowser.h
include/beep/formatter.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/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
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

Return to bug 62495

Lines 6-27 Link Here

(-)beep-media-player/Makefile (-6 / +7 lines)
6	#	6	#
7		7
8	PORTNAME= beep-media-player	8	PORTNAME= beep-media-player
9	PORTVERSION= 1.0.0	9	PORTVERSION= 0.9.6.1
10	PORTREVISION= 4	10	PORTEPOCH= 1
11	CATEGORIES= multimedia audio	11	CATEGORIES= multimedia audio
12	MASTER_SITES= http://linux-media.net/beep/downloads/	12	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
13	DISTNAME= ${PORTNAME}-${PORTVERSION}-pre5	13	MASTER_SITE_SUBDIR= beepmp
		14	DISTNAME= bmp-${PORTVERSION}
14		15
15	MAINTAINER= flynn@energyhq.es.eu.org	16	MAINTAINER= flynn@energyhq.es.eu.org
16	COMMENT= GTK2 mp3 player	17	COMMENT= GTK2 mp3 player
17		18
18	LIB_DEPENDS= iconv.3:${PORTSDIR}/converters/libiconv	19	LIB_DEPENDS= iconv.3:${PORTSDIR}/converters/libiconv
19		20
20	WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}-pre5
21	USE_GNOME= gtk20	21	USE_GNOME= gtk20
22	WANT_GNOME= yes	22	WANT_GNOME= yes
23	USE_X_PREFIX= yes	23	USE_X_PREFIX= yes
24	USE_REINPLACE= yes	24	USE_REINPLACE= yes
		25	USE_LIBTOOL= yes
25	USE_GMAKE= yes	26	USE_GMAKE= yes
26	INSTALLS_SHLIB= yes	27	INSTALLS_SHLIB= yes
27	GNU_CONFIGURE= yes	28	GNU_CONFIGURE= yes
Lines 30-36 Link Here
30	INPUT_PLUGINS="${INPUT_PLUGINS}" \	31	INPUT_PLUGINS="${INPUT_PLUGINS}" \
31	OUTPUT_PLUGINS="${OUTPUT_PLUGINS}" \	32	OUTPUT_PLUGINS="${OUTPUT_PLUGINS}" \
32	VISUALIZATION_PLUGINS="${VISUALIZATION_PLUGINS}"	33	VISUALIZATION_PLUGINS="${VISUALIZATION_PLUGINS}"
33	MAN1= beep.1	34	MAN1= beep-media-player.1
34		35
35	INPUT_PLUGINS= cdaudio,mpg123	36	INPUT_PLUGINS= cdaudio,mpg123
36	OUTPUT_PLUGINS= OSS	37	OUTPUT_PLUGINS= OSS

Lines 1-15 Link Here

(-)beep-media-player/files/patch-Input::cdaudio::cdaudio.c (-15 lines)
1	--- Input/cdaudio/cdaudio.c.orig Fri Nov 14 05:38:50 2003
2	+++ Input/cdaudio/cdaudio.c Fri Nov 14 05:39:31 2003
3	@@ -695,10 +695,11 @@
4	struct driveinfo* cdda_find_drive(char *filename)
5	{
6	GList *node;
7	+ struct driveinfo *d;
8
9	// FIXME: Will always return the first drive
10	node = cdda_cfg.drives;
11	- struct driveinfo *d = node->data;
12	+ d = node->data;
13
14	for (node = cdda_cfg.drives; node; node = node->next)
15	{

Lines 1-71 Link Here

(-)beep-media-player/files/patch-Input::mpg123::fileinfo.c (-64 / +54 lines)
1	--- Input/mpg123/fileinfo.c.orig Fri Nov 14 05:40:55 2003	1	--- Input/mpg123/fileinfo.c.orig Sat Feb 7 18:24:23 2004
2	+++ Input/mpg123/fileinfo.c Fri Nov 14 05:44:47 2003	2	+++ Input/mpg123/fileinfo.c Sat Feb 7 18:34:26 2004
3	@@ -299,6 +299,8 @@	3	@@ -299,6 +299,13 @@
4	gint i;	4	{
5	gchar *title;	5	gint i;
6		6	gchar *title;
		7	+ GtkWidget *pixmapwid;
		8	+ GdkPixbuf *pixbuf;
		9	+ PangoAttribute *attr;
		10	+ PangoAttrList *attrs;
		11	+ GtkWidget *test_table;
		12	+ GtkWidget urk, blark;
7	+ struct stat mstat;	13	+ struct stat mstat;
8	+
9	emphasis[0] = _("None");
10	emphasis[1] = _("50/15 ms");
11	emphasis[2] = "";
12	@@ -308,6 +310,14 @@
13
14	if (!window)
15	{
16	+ GtkWidget * pixmapwid;
17	+ GdkPixbuf * pixbuf;
18	+
19	+ PangoAttrList *attrs;
20	+ PangoAttribute *attr;
21	+
22	+ GtkWidget * test_table;
23	+ GtkWidget urk,blark;
24
25	window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
26	gtk_window_set_policy(GTK_WINDOW(window), FALSE, FALSE, FALSE);
27	@@ -322,8 +332,6 @@
28	filename_vbox = gtk_hbox_new(FALSE, 5);
29	gtk_box_pack_start(GTK_BOX(vbox), filename_vbox, FALSE, TRUE, 0);
30
31	- GtkWidget * pixmapwid;
32	- GdkPixbuf * pixbuf;
33	pixbuf = gdk_pixbuf_new_from_xpm_data((const char **)gnome_mime_audio_xpm);
34	pixmapwid = gtk_image_new_from_pixbuf(pixbuf);
35	g_object_unref(pixbuf);
36	@@ -332,9 +340,6 @@
37		14
38	label = gtk_label_new(NULL);	15	emphasis[0] = _("None");
		16	emphasis[1] = _("50/15 ms");
		17	@@ -323,8 +330,6 @@
		18	filename_vbox = gtk_hbox_new(FALSE, 5);
		19	gtk_box_pack_start(GTK_BOX(vbox), filename_vbox, FALSE, TRUE, 0);
		20
		21	- GtkWidget *pixmapwid;
		22	- GdkPixbuf *pixbuf;
		23	pixbuf = gdk_pixbuf_new_from_xpm_data((const char **)
		24	gnome_mime_audio_xpm);
		25	pixmapwid = gtk_image_new_from_pixbuf(pixbuf);
		26	@@ -335,9 +340,6 @@
		27
		28	label = gtk_label_new(NULL);
39		29
40	- PangoAttrList *attrs;	30	- PangoAttrList *attrs;
41	- PangoAttribute *attr;	31	- PangoAttribute *attr;
42	-	32	-
43	attrs = pango_attr_list_new ();	33	attrs = pango_attr_list_new();
44		34
45	attr = pango_attr_weight_new (PANGO_WEIGHT_BOLD);	35	attr = pango_attr_weight_new(PANGO_WEIGHT_BOLD);
46	@@ -377,7 +382,7 @@	36	@@ -382,7 +384,7 @@
47	//// MPEG Layer Info	37	//// MPEG Layer Info
48		38
49	// FIXME: Obvious...	39	// FIXME: Obvious...
50	- GtkWidget * test_table = gtk_table_new(2, 10, FALSE);	40	- GtkWidget *test_table = gtk_table_new(2, 10, FALSE);
51	+ test_table = gtk_table_new(2, 10, FALSE);	41	+ test_table = gtk_table_new(2, 10, FALSE);
52	gtk_container_set_border_width(GTK_CONTAINER(test_table), 0);	42	gtk_container_set_border_width(GTK_CONTAINER(test_table), 0);
53	gtk_container_add(GTK_CONTAINER(mpeg_box), test_table);	43	gtk_container_add(GTK_CONTAINER(mpeg_box), test_table);
54		44
55	@@ -437,8 +442,6 @@	45	@@ -457,8 +459,6 @@
56	gtk_label_set_justify(GTK_LABEL(mpeg_filesize_val), GTK_JUSTIFY_LEFT );	46	gtk_table_attach(GTK_TABLE(test_table), mpeg_filesize_val, 1, 2, 4,
57	gtk_table_attach(GTK_TABLE(test_table), mpeg_filesize_val, 1, 2, 4, 5, GTK_FILL, GTK_FILL, 10, 2);	47	5, GTK_FILL, GTK_FILL, 10, 2);
58		48
59	- GtkWidget urk,blark;	49	- GtkWidget urk, blark;
60	-	50	-
61	urk = gtk_label_new("");	51	urk = gtk_label_new("");
62	blark = gtk_label_new("");	52	blark = gtk_label_new("");
63	gtk_misc_set_alignment(GTK_MISC(urk), 1, 0.5);	53	gtk_misc_set_alignment(GTK_MISC(urk), 1, 0.5);
64	@@ -683,7 +686,6 @@	54	@@ -756,7 +756,6 @@
65	return;	55	return;
66	}	56	}
67		57
68	- struct stat mstat;	58	- struct stat mstat;
69	stat(filename,&mstat);	59	stat(filename, &mstat);
70	gtk_widget_set_sensitive(id3_frame, ((mstat.st_mode & S_IWRITE) == S_IWRITE ) );	60	gtk_widget_set_sensitive(id3_frame,
71	/* FIXME: Check for UID/GID too? */	61	((mstat.st_mode & S_IWRITE) == S_IWRITE));

Line 0 Link Here

(-)beep-media-player/files/patch-Input::mpg123::mpg123.c (+42 lines)
	1	--- Input/mpg123/mpg123.c.orig Sat Feb 7 18:21:05 2004
	2	+++ Input/mpg123/mpg123.c Sat Feb 7 18:23:32 2004
	3	@@ -635,6 +635,7 @@
	4	gchar ** genre, guint * tracknum)
	5	{
	6	FILE *file;
	7	+ int result_seek, result_read;
	8	struct id3v1tag_t id3v1tag;
	9	struct id3tag_t id3tag;
	10
	11	@@ -669,12 +670,12 @@
	12	if (!id3) {
	13
	14
	15	- int result_seek = fseek(file, -1 * sizeof(id3v1tag), SEEK_END);
	16	+ result_seek = fseek(file, -1 * sizeof(id3v1tag), SEEK_END);
	17	if (result_seek)
	18	return;
	19
	20
	21	- int result_read = fread(&id3v1tag, 1, sizeof(id3v1tag), file);
	22	+ result_read = fread(&id3v1tag, 1, sizeof(id3v1tag), file);
	23	if (result_read != sizeof(id3v1tag))
	24	return;
	25	if (strncmp(id3v1tag.tag, "TAG", 3) != 0)
	26	@@ -1111,6 +1112,8 @@
	27
	28	static void play_file(char *filename)
	29	{
	30	+ pthread_attr_t pta;
	31	+
	32	memset(&fr, 0, sizeof(struct frame));
	33	memset(&temp_fr, 0, sizeof(struct frame));
	34
	35	@@ -1124,7 +1127,6 @@
	36	output_opened = FALSE;
	37	dopause = FALSE;
	38
	39	- pthread_attr_t pta;
	40	(void) pthread_attr_init(&pta);
	41	(void) pthread_attr_setschedpolicy(&pta, PTHREAD_INHERIT_SCHED);
	42	(void) pthread_attr_setscope(&pta, PTHREAD_SCOPE_SYSTEM);

Lines 1-75 Link Here

(-)beep-media-player/files/patch-Input::vorbis::fileinfo.c (-70 / +74 lines)
1	--- Input/vorbis/fileinfo.c.orig Wed Dec 24 09:02:52 2003	1	--- Input/vorbis/fileinfo.c.orig Sat Feb 7 19:35:28 2004
2	+++ Input/vorbis/fileinfo.c Wed Dec 24 09:07:28 2003	2	+++ Input/vorbis/fileinfo.c Sat Feb 7 19:42:05 2004
3	@@ -498,6 +498,8 @@	3	@@ -488,12 +488,21 @@
4		4
5	static GtkWidget filename_entry, tag_frame;	5	static GtkWidget filename_entry, tag_frame;
6		6
		7	+ GtkWidget hbox, label, filename_hbox, vbox, *left_vbox;
		8	+ GtkWidget table, bbox, *cancel_button;
		9	+ GtkWidget *pixmapwid;
		10	+ GdkPixbuf *pixbuf;
		11	+ PangoAttrList *attrs;
		12	+ PangoAttribute *attr;
		13	+ GtkWidget *boxx;
		14	+ GtkImage *img;
		15	+ GtkWidget *test_table;
7	+ struct stat mstat;	16	+ struct stat mstat;
8	+	17	+
9	g_free(vte.filename);	18	g_free(vte.filename);
10	vte.filename = g_strdup(fn);	19	vte.filename = g_strdup(fn);
11
12	@@ -505,6 +507,13 @@
13	{
14	GtkWidget hbox, label, filename_hbox, vbox, *left_vbox;
15	GtkWidget table, bbox, *cancel_button;
16	+ GtkWidget * pixmapwid;
17	+ GdkPixbuf * pixbuf;
18	+ PangoAttrList *attrs;
19	+ PangoAttribute *attr;
20	+ GtkWidget * boxx;
21	+ GtkImage * img;
22	+ GtkWidget * test_table;
23
24	window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
25	gtk_window_set_policy(GTK_WINDOW(window), FALSE, FALSE, FALSE);
26	@@ -519,14 +528,11 @@
27	filename_hbox = gtk_hbox_new(FALSE, 5);
28	gtk_box_pack_start(GTK_BOX(vbox), filename_hbox, FALSE, TRUE, 0);
29
30	- GtkWidget * pixmapwid;
31	- GdkPixbuf * pixbuf = gdk_pixbuf_new_from_xpm_data((const char **)gnome_mime_audio_ogg_xpm);
32	+ pixbuf = gdk_pixbuf_new_from_xpm_data((const char **)gnome_mime_audio_ogg_xpm);
33	pixmapwid = gtk_image_new_from_pixbuf(pixbuf);
34	gtk_misc_set_alignment(GTK_MISC(pixmapwid), 0, 0);
35	gtk_box_pack_start(GTK_BOX(filename_hbox), pixmapwid, FALSE, FALSE, 0);
36
37	- PangoAttrList *attrs;
38	- PangoAttribute *attr;
39		20
40	attrs = pango_attr_list_new ();	21	if (!window) {
41		22	- GtkWidget hbox, label, filename_hbox, vbox, *left_vbox;
42	@@ -728,7 +734,6 @@	23	- GtkWidget table, bbox, *cancel_button;
43	GTK_FILL \| GTK_EXPAND \| GTK_SHRINK, 0, 5);	24
		25	window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
		26	gtk_window_set_policy(GTK_WINDOW(window), FALSE, FALSE, FALSE);
		27	@@ -508,17 +517,13 @@
		28	filename_hbox = gtk_hbox_new(FALSE, 5);
		29	gtk_box_pack_start(GTK_BOX(vbox), filename_hbox, FALSE, TRUE, 0);
		30
		31	- GtkWidget *pixmapwid;
		32	- GdkPixbuf pixbuf = gdk_pixbuf_new_from_xpm_data((const char *)
		33	+ pixbuf = gdk_pixbuf_new_from_xpm_data((const char **)
		34	gnome_mime_audio_ogg_xpm);
		35	pixmapwid = gtk_image_new_from_pixbuf(pixbuf);
		36	gtk_misc_set_alignment(GTK_MISC(pixmapwid), 0, 0);
		37	gtk_box_pack_start(GTK_BOX(filename_hbox), pixmapwid, FALSE, FALSE,
		38	0);
		39
		40	- PangoAttrList *attrs;
		41	- PangoAttribute *attr;
		42	-
		43	attrs = pango_attr_list_new();
		44
		45	attr = pango_attr_weight_new(PANGO_WEIGHT_BOLD);
		46	@@ -722,7 +727,6 @@
		47	GTK_FILL \| GTK_EXPAND \| GTK_SHRINK, 0, 5);
44	#endif	48	#endif
45		49
46	- GtkWidget * boxx;	50	- GtkWidget *boxx;
47	boxx = gtk_hbutton_box_new();	51	boxx = gtk_hbutton_box_new();
48	gtk_hbutton_box_set_layout_default(GTK_BUTTONBOX_SPREAD);	52	gtk_hbutton_box_set_layout_default(GTK_BUTTONBOX_SPREAD);
49		53
50	@@ -746,7 +751,7 @@	54	@@ -739,7 +743,7 @@
51	gtk_table_attach(table,boxx,0,5,6,7,GTK_FILL,0,0,8);	55	gtk_table_attach(table, boxx, 0, 5, 6, 7, GTK_FILL, 0, 0, 8);
52		56
53	rg_show_button = gtk_toggle_button_new();	57	rg_show_button = gtk_toggle_button_new();
54	- GtkImage * img = gtk_image_new_from_stock(GTK_STOCK_GO_FORWARD, GTK_ICON_SIZE_MENU);	58	- GtkImage *img = gtk_image_new_from_stock(GTK_STOCK_GO_FORWARD,
55	+ img = gtk_image_new_from_stock(GTK_STOCK_GO_FORWARD, GTK_ICON_SIZE_MENU);	59	+ img = gtk_image_new_from_stock(GTK_STOCK_GO_FORWARD,
56	gtk_container_add(rg_show_button,img);	60	GTK_ICON_SIZE_MENU);
57	g_signal_connect(G_OBJECT(rg_show_button), "toggled",	61	gtk_container_add(rg_show_button, img);
58	G_CALLBACK(rg_show_cb), NULL);	62	g_signal_connect(G_OBJECT(rg_show_button), "toggled",
59	@@ -836,7 +841,7 @@	63	@@ -832,7 +836,7 @@
60	gtk_box_set_spacing(GTK_BOX(info_box), 0);	64	gtk_box_set_spacing(GTK_BOX(info_box), 0);
61		65
62	// FIXME: Obvious...	66	// FIXME: Obvious...
63	- GtkWidget * test_table = gtk_table_new(2, 10, FALSE);	67	- GtkWidget *test_table = gtk_table_new(2, 10, FALSE);
64	+ test_table = gtk_table_new(2, 10, FALSE);	68	+ test_table = gtk_table_new(2, 10, FALSE);
65	gtk_container_set_border_width(GTK_CONTAINER(test_table), 0);	69	gtk_container_set_border_width(GTK_CONTAINER(test_table), 0);
66	gtk_container_add(GTK_CONTAINER(info_box), test_table);	70	gtk_container_add(GTK_CONTAINER(info_box), test_table);
67		71
68	@@ -1068,7 +1073,6 @@	72	@@ -1073,7 +1077,6 @@
69	gtk_window_set_title(GTK_WINDOW(window), tmp);	73	gtk_window_set_title(GTK_WINDOW(window), tmp);
70	// rg_show_cb(rg_show_button, NULL);	74	// rg_show_cb(rg_show_button, NULL);
71		75
72	- struct stat mstat;	76	- struct stat mstat;
73	stat(fn,&mstat);	77	stat(fn, &mstat);
74	gtk_widget_set_sensitive(tag_frame, ((mstat.st_mode & S_IWRITE) == S_IWRITE ) );	78	gtk_widget_set_sensitive(tag_frame,
75		79	((mstat.st_mode & S_IWRITE) == S_IWRITE));

Lines 1-18 Link Here

(-)beep-media-player/files/patch-Input::vorbis::vorbis.c (-16 / +14 lines)
1	--- Input/vorbis/vorbis.c.orig Wed Dec 24 09:00:39 2003	1	--- Input/vorbis/vorbis.c.orig Sat Feb 7 19:26:13 2004
2	+++ Input/vorbis/vorbis.c Wed Dec 24 09:00:52 2003	2	+++ Input/vorbis/vorbis.c Sat Feb 7 19:32:10 2004
3	@@ -134,6 +134,7 @@	3	@@ -521,12 +521,12 @@
4	FILE *stream;
5	OggVorbis_File vfile; /* avoid thread interaction */
6	char *ext;
7	+ gint result;
8		4
		5	static void vorbis_play(char *filename)
		6	{
		7	+ pthread_attr_t pta;
		8	vorbis_playing = 1;
		9	vorbis_bytes_streamed = 0;
		10	vorbis_eos = 0;
		11	output_error = FALSE;
9		12
10	/* is this our http resource? */	13	- pthread_attr_t pta;
11	@@ -161,7 +162,6 @@	14	(void) pthread_attr_init(&pta);
12	memset(&vfile, 0, sizeof(vfile));	15	(void) pthread_attr_setschedpolicy(&pta, PTHREAD_INHERIT_SCHED);
13	pthread_mutex_lock(&vf_mutex);	16	(void) pthread_attr_setscope(&pta, PTHREAD_SCOPE_SYSTEM);
14
15	- gint result;
16	result = ov_test(stream, &vfile, NULL, 0);
17
18	switch (result) {

Line 0 Link Here

(-)beep-media-player/files/patch-beep::dirbrowser.c (+177 lines)
		1	--- beep/dirbrowser.c.orig Sat Feb 7 18:04:24 2004
		2	+++ beep/dirbrowser.c Sat Feb 7 18:18:23 2004
		3	@@ -263,15 +263,17 @@
		4	static gchar bmp_db_sanify_tag(gchar value)
		5	{
		6
		7	- if (!value)
		8	- return "(unknown)";
		9	-
		10	+ GString *chunk;
		11	gchar *frag = NULL;
		12	gchar **branches;
		13	guint ctr = 0;
		14	gboolean bracket_open = FALSE;
		15
		16	- GString *chunk = g_string_new(NULL);
		17	+ if (!value)
		18	+ return "(unknown)";
		19	+
		20	+
		21	+ chunk = g_string_new(NULL);
		22	branches = g_strsplit(g_strstrip(value), " ", 0);
		23
		24	while (frag \|\| (ctr == 0)) {
		25	@@ -346,6 +348,7 @@
		26	GList *list = NULL;
		27	gboolean first = TRUE;
		28	gchar *from_real;
		29	+ GdkPixbuf buf_dir, buf_file, *buf_cda;
		30
		31	from = g_locale_from_utf8(from, -1, NULL, NULL, NULL);
		32	from_real = bmp_db_get_path_real(from, model, &parent_iter);
		33	@@ -353,18 +356,19 @@
		34
		35	/* It's not really a waste creating both beforehand since we will
		36	* certainly need the folder one at least once, and most probably
		37	- * the audio one too anyway */
		38	- GdkPixbuf *buf_dir = gdk_pixbuf_new_from_inline(sizeof(folder_pixbuf),
		39	+ * the audio one too anyway.
		40	+ */
		41	+ buf_dir = gdk_pixbuf_new_from_inline(sizeof(folder_pixbuf),
		42	folder_pixbuf,
		43	TRUE,
		44	NULL);
		45
		46	- GdkPixbuf *buf_file = gdk_pixbuf_new_from_inline(sizeof(audio_pixbuf),
		47	+ buf_file = gdk_pixbuf_new_from_inline(sizeof(audio_pixbuf),
		48	audio_pixbuf,
		49	TRUE,
		50	NULL);
		51
		52	- GdkPixbuf *buf_cda = gdk_pixbuf_new_from_inline(sizeof(cda_pixbuf),
		53	+ buf_cda = gdk_pixbuf_new_from_inline(sizeof(cda_pixbuf),
		54	cda_pixbuf,
		55	TRUE,
		56	NULL);
		57	@@ -654,6 +658,7 @@
		58
		59	GtkTreeModel *model;
		60	GtkTreeView *treeview;
		61	+ GtkWidget *store;
		62
		63	treeview = gtk_tree_selection_get_tree_view(sel);
		64	model = gtk_tree_view_get_model(treeview);
65	@@ -681,7 +686,7 @@
66	paths = paths->next;
67	}
68
69	- GtkWidget *store =
70	+ store =
71	GTK_WIDGET(bmp_db_return_filestore_model_fresh(paths_f));
72
73	gtk_tree_view_set_model(user_data, GTK_TREE_MODEL(store));
74	@@ -706,6 +711,7 @@
75
76	struct stat statbuf;
77	GtkTreeModel *model;
78	+ gboolean valid;
79
80	model = gtk_tree_view_get_model(treeview);
81	paths = bmp_db_get_paths_from_selection(treeview);
82	@@ -735,7 +741,7 @@
83	if (gtk_tree_model_iter_children(model, &iter_child, &iter)) {
84	if (click_play)
85	playlist_clear();
86	- gboolean valid = TRUE;
87	+ valid = TRUE;
88	while (valid) {
89	gtk_tree_model_get(GTK_TREE_MODEL(model), &iter_child,
90	FILENAME_COL, &node_name, -1);
91	@@ -1308,12 +1314,15 @@
92	{
93
94	GtkTreeStore *file_store;
95	-
96	+ GtkTreeModel *sort_model;
97	+ gdouble length_pl, frac;
98	+ int ctr=0;
99	+ GList *files;
100
101	file_store =
102	gtk_tree_store_new(5, GDK_TYPE_PIXBUF, G_TYPE_STRING, G_TYPE_INT,
103	G_TYPE_STRING, G_TYPE_INT);
104	- GtkTreeModel *sort_model =
105	+ sort_model =
106	gtk_tree_model_sort_new_with_model(GTK_TREE_MODEL(file_store));
107
108
109	@@ -1321,17 +1330,16 @@
110	bmp_db_mdb_sort_func, NULL, NULL);
111
112
113	- gdouble length_pl = g_list_length(paths);
114	+ length_pl = g_list_length(paths);
115	gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(progressbar_db), 0.0);
116
117	- int ctr = 0;
118
119	while (paths) {
120
121	gchar *path = paths->data;
122	ctr++;
123
124	- GList *files = bmp_db_return_files_from_path(path);
125	+ files = bmp_db_return_files_from_path(path);
126
127	while (files) {
128	gchar *title;
129	@@ -1356,7 +1364,7 @@
130	files = files->next;
131	}
132
133	- gdouble frac = 1 / length_pl;
134	+ frac = 1 / length_pl;
135	gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(progressbar_db),
136	frac * ctr);
137	while (gtk_events_pending()) {
138	@@ -1411,15 +1419,17 @@
139	GtkWidget *treeview = NULL;
140	GtkWidget *label_header;
141	GtkWidget *paned;
142	+ GtkWidget *fstore;
143	+ GList *paths = NULL;
144	+ PangoAttrList *attrs;
145	+ PangoAttribute *attr;
146	+ GtkTreeSelection *sel;
147
148	if (!window) {
149
150	/* create window, etc */
151	/* yes this is all messed up */
152
153	- PangoAttrList *attrs;
154	- PangoAttribute *attr;
155	-
156	window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
157	gtk_window_set_title(GTK_WINDOW(window), "bmp :: Add Files...");
158	gtk_container_set_border_width(GTK_CONTAINER(window), 8);
159	@@ -1489,17 +1499,15 @@
160	G_CALLBACK(bmp_db_keypress), window);
161
162	gtk_container_add(GTK_CONTAINER(sw), treeview);
163	- GtkWidget *fstore;
164
165	/* FIXME: clean up variables, move them to start */
166
167	/* FIXME: paths is not freed, and is resetted every iteration */
168	- GList *paths = NULL;
169	paths = g_list_append(paths, g_strdup(g_get_home_dir()));
170	fstore = bmp_db_return_filestore_fresh(paths);
171	gtk_container_add(GTK_CONTAINER(sw_right), fstore);
172
173	- GtkTreeSelection *sel =
174	+ sel =
175	gtk_tree_view_get_selection(GTK_TREE_VIEW(treeview));
176	g_signal_connect(G_OBJECT(sel), "changed",
177	G_CALLBACK(bmp_db_row_activated), fstore);

Lines 1-25 Link Here

(-)beep-media-player/files/patch-beep::main.c (-25 lines)
1	--- beep/main.c.orig Sat Nov 15 21:33:27 2003
2	+++ beep/main.c Sat Nov 15 21:35:22 2003
3	@@ -1634,7 +1634,7 @@
4
5	if (treeview->selection)
6	{
7	- pos = gtk_treeview_get_row_data(treeview, GPOINTER_TO_INT(treeview->selection->data));
8	+// pos = gtk_treeview_get_row_data(treeview, GPOINTER_TO_INT(treeview->selection->data));
9	playlist_queue_position(*pos);
10	gtk_widget_set(GTK_WIDGET(widget), "label", playlist_is_position_queued(*pos) ? "Unqueue" : "Queue", NULL);
11	}
12	@@ -2030,11 +2030,12 @@
13
14
15	if (!strncasecmp(path,"fonts:///",9)) {
16	+ gchar * decoded;
17	path[strlen(path)-2] = 0; /* Why the hell a CR&LF? */
18	path = path + 8;
19
20	/* plain, since we already stripped the first URI part */
21	- gchar * decoded = xmms_urldecode_plain(path);
22	+ decoded = xmms_urldecode_plain(path);
23	decoded++;
24
25	/* Get the old font's size, and add it to the dropped font's name */

Lines 1-20 Link Here

(-)beep-media-player/files/patch-beep::output.c (-20 lines)
1	--- beep/output.c.orig Fri Nov 14 05:21:23 2003
2	+++ beep/output.c Fri Nov 14 05:21:52 2003
3	@@ -31,14 +31,15 @@
4	{
5	gint time;
6	gint pos;
7	-
8	+ gboolean playing;
9	+
10	GList *node = g_list_nth(op_data->output_list, i);
11	if (node)
12	op_data->current_output_plugin = node->data;
13	else
14	op_data->current_output_plugin = NULL;
15
16	- gboolean playing = get_input_playing();
17	+ playing = get_input_playing();
18	if (playing) {
19
20	/* FIXME: we do all on our own here */

Lines 1-149 Link Here

(-)beep-media-player/files/patch-beep::playlist.c (-149 lines)
1	--- beep/playlist.c.orig Fri Nov 14 06:25:26 2003
2	+++ beep/playlist.c Fri Nov 14 06:34:23 2003
3	@@ -607,6 +607,7 @@
4
5	while (*string)
6	{
7	+ GList *node;
8	temp = strchr(string, '\n');
9	if (temp)
10	{
11	@@ -633,7 +634,6 @@
12	}
13	}
14
15	- GList *node;
16	node = g_list_nth(get_playlist(), pos);
17
18	entries += i;
19	@@ -2346,6 +2346,7 @@
20	guint64 node_idx;
21	gchar * from_real;
22	gboolean error;
23	+ db_node * node;
24
25	/* It's not really a waste creating both beforehand since we will certainly need the folder one at least once,
26	and most probably the audio one too anyway */
27	@@ -2366,7 +2367,6 @@
28
29	current = gtk_tree_model_get_path(model, &parent_iter);
30	node_idx = dirbrowser_get_nodeidx_from_iter(model, &parent_iter, 0, &error);
31	- db_node * node;
32	node = g_ptr_array_index(nodes, node_idx);
33	from_real = g_strconcat(node->path_real,"/",from,NULL);
34
35	@@ -2388,10 +2388,11 @@
36	{
37	while ((dirent = readdir(dir)) != NULL)
38	{
39	+ char * name_real;
40	// FIXME: Excludes hidden dirs too (do we want them anyway?)
41	if (dirent->d_name[0] == '.')
42	continue;
43	- char * name_real = g_strdup(g_strconcat(from_real,"/",dirent->d_name,NULL));
44	+ name_real = g_strdup(g_strconcat(from_real,"/",dirent->d_name,NULL));
45	stat(name_real, &statbuf);
46
47	if ( S_ISDIR(statbuf.st_mode) ) {
48	@@ -2513,9 +2514,10 @@
49	char buffer, lines, *frags;
50	struct stat stats;
51	guint i;
52	-
53	+ GdkPixbuf * buf;
54	+
55	model = gtk_tree_store_new(2, GDK_TYPE_PIXBUF, G_TYPE_STRING);
56	- GdkPixbuf * buf = gdk_pixbuf_new_from_inline(sizeof(harddisk_pixbuf),
57	+ buf = gdk_pixbuf_new_from_inline(sizeof(harddisk_pixbuf),
58	harddisk_pixbuf,
59	TRUE,
60	NULL);
61	@@ -2803,13 +2805,16 @@
62
63	PangoAttrList *attrs;
64	PangoAttribute *attr;
65	+
66	+ GdkPixbuf * buf;
67	+
68	attrs = pango_attr_list_new ();
69	attr = pango_attr_weight_new (PANGO_WEIGHT_BOLD);
70	attr->start_index = 0;
71	attr->end_index = -1;
72	pango_attr_list_insert (attrs, attr);
73
74	- GdkPixbuf * buf = gdk_pixbuf_new_from_inline(sizeof(harddisk_pixbuf),
75	+ buf = gdk_pixbuf_new_from_inline(sizeof(harddisk_pixbuf),
76	harddisk_pixbuf,
77	TRUE,
78	NULL);
79	@@ -2863,9 +2868,10 @@
80	if ( S_ISDIR(statbuf.st_mode) ) {
81
82	db_node * node;
83	- node = g_malloc0(sizeof(db_node));
84	char * dir = g_strdup(path_real);
85	char * name = g_strdup(path_real);
86	+
87	+ node = g_malloc0(sizeof(db_node));
88	node->path_real = dir;
89
90	gtk_label_set_text(variable, g_strdup(g_strconcat("Choose a Name for:\n",name,NULL)));
91	@@ -2932,9 +2938,9 @@
92	(model,
93	&iter,
94	gtk_tree_path_to_string(paths->data))) {
95	+ db_node * node;
96	gtk_tree_store_remove (GTK_TREE_STORE(model), &iter);
97
98	- db_node * node;
99	node = g_ptr_array_index(nodes, node_idx);
100	g_ptr_array_remove_index(nodes, node_idx);
101	ctr_array--;
102	@@ -3178,7 +3184,11 @@
103	/* create window, etc */
104
105	/* yes this is all messed up */
106	-
107	+ GSList * group;
108	+ GtkWidget * hbox_default_setting;
109	+ PangoAttrList *attrs;
110	+ PangoAttribute *attr;
111	+
112	window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
113	gtk_window_set_title (GTK_WINDOW (window), "beep :: directory browser");
114	gtk_container_set_border_width(GTK_CONTAINER(window),
115	@@ -3195,8 +3205,6 @@
116
117	vbox = gtk_vbox_new (FALSE, 0);
118
119	- PangoAttrList *attrs;
120	- PangoAttribute *attr;
121	attrs = pango_attr_list_new ();
122	attr = pango_attr_weight_new (PANGO_WEIGHT_BOLD);
123	attr->start_index = 0;
124	@@ -3235,8 +3243,6 @@
125	hbox = gtk_hbox_new (FALSE, 0);
126	gtk_box_pack_start(GTK_BOX(vbox),hbox,FALSE,FALSE, 0);
127
128	- GSList * group;
129	-
130	rb_enq = gtk_radio_button_new(NULL);
131	group = gtk_radio_button_get_group(rb_enq);
132	rb_play = gtk_radio_button_new(group);
133	@@ -3257,7 +3263,6 @@
134
135	gtk_misc_set_alignment(GTK_MISC(label_rb), 0.0, 0.0);
136
137	- gtk_label_set_attributes (GTK_LABEL(label_rb), attrs);
138
139	gtk_container_add(GTK_CONTAINER (frame),vbox);
140	gtk_box_pack_start(GTK_BOX (vbox_main), frame,TRUE,TRUE,0);
141	@@ -3287,7 +3292,7 @@
142
143	hbox_lower = gtk_hbox_new(FALSE, 8);
144
145	- GtkWidget * hbox_default_setting = gtk_hbox_new(FALSE,8);
146	+ hbox_default_setting = gtk_hbox_new(FALSE,8);
147
148	gtk_box_pack_start(GTK_BOX(hbox_default_setting), table_rb,FALSE,FALSE,0);
149	gtk_box_pack_start(GTK_BOX(hbox_default_setting), gtk_vseparator_new(), FALSE,FALSE,0);

Lines 1-47 Link Here

(-)beep-media-player/files/patch-beep::playlist_list.c (-42 / +14 lines)
1	--- beep/playlist_list.c.orig Fri Nov 14 05:24:54 2003	1	--- beep/playlist_list.c.orig Sat Feb 7 17:53:46 2004
2	+++ beep/playlist_list.c Fri Nov 14 05:28:24 2003	2	+++ beep/playlist_list.c Sat Feb 7 17:54:59 2004
3	@@ -292,6 +292,8 @@	3	@@ -372,6 +372,7 @@
4	int len;	4	gint i, tw, max_first;
5	int pix_len;	5	guint padding;
6	char *tmp;	6	guint max_time_len = 0;
7	+ guint padding, plist_length_int;	7	+ gchar **frags;
8	+ PangoLayout * layout;
9		8
10	if (cfg.convert_underscore)	9	gc = pl->pl_widget.gc;
11	while ((tmp = strchr(text, '_')) != NULL)	10	width = pl->pl_widget.width;
12	@@ -318,9 +320,6 @@	11	@@ -507,7 +508,7 @@
13	pix_len = (width_approx_letters * len);
14	}
15		12
16	-
17	- guint padding, plist_length_int;
18	- PangoLayout * layout;
19	if (cfg.show_numbers_in_pl) {
20		13
21		14
22	@@ -442,12 +441,13 @@	15	- gchar **frags = g_strsplit(tail, ":", 0);
23	{	16	+ frags = g_strsplit(tail, ":", 0);
24	int x, y;
25	gchar * tail;
26	-
27	+ guint t_width;
28	+ guint len_tail;
29	+ guint len;
30	+
31	tail = g_strdup_printf("%s%s",qstr,length);
32		17
33	if (strlen(tail) > max_time_len) max_time_len = strlen(tail);	18	layout =
34	- guint t_width;	19	gtk_widget_create_pango_layout(GTK_WIDGET(playlistwin),
35	- guint len_tail;
36
37	/* FIXME: This is just an approximate alignment, maybe
38	something still fast, but exact could be done */
39	@@ -485,7 +485,7 @@
40	else
41	gdk_gc_set_foreground(gc, get_skin_color(SKIN_PLEDIT_NORMAL));
42
43	- guint len = strlen(tail);
44	+ len = strlen(tail);
45
46	layout = gtk_widget_create_pango_layout(GTK_WIDGET(playlistwin),tail);
47	pango_layout_set_font_description (layout, playlist_list_font);

Line 0 Link Here

(-)beep-media-player/files/patch-beep::pluginenum.c (+18 lines)
	1	--- beep/pluginenum.c.orig Wed Dec 24 15:03:17 2003
	2	+++ beep/pluginenum.c Sat Feb 7 22:08:41 2004
	3	@@ -238,6 +238,7 @@
	4
	5
	6	#ifndef DISABLE_USER_PLUGIN_DIR
	7	+if(0) {
	8	dir = g_build_filename(g_get_home_dir(), BMP_RCPATH, "plugins");
	9	bmp_scan_plugins(dir);
	10	g_free(dir);
	11	@@ -259,6 +260,7 @@
	12	g_free(dir);
	13	}
	14	dirsel = 0;
	15	+}
	16	#endif
	17
	18	while (plugin_dir_list[dirsel]) {

Lines 1-43 Link Here

(-)beep-media-player/files/patch-beep::prefswin.c (-43 lines)
1	--- beep/prefswin.c.orig Fri Nov 14 05:33:05 2003
2	+++ beep/prefswin.c Fri Nov 14 05:36:04 2003
3	@@ -752,11 +752,15 @@
4	GtkObject *options_mouse_adj;
5	GtkWidget prefswin_title_desc, prefswin_title_label, *opt;
6
7	+ GtkWidget *table_rb;
8	+ GtkWidget *label;
9	+
10	char *titles[1];
11
12	PangoAttrList *attrs;
13	PangoAttribute *attr;
14
15	+ PangoFontDescription * playlist_list_font;
16
17	prefswin = gtk_window_new(GTK_WINDOW_TOPLEVEL);
18	gtk_window_set_position(GTK_WINDOW(prefswin),GTK_WIN_POS_CENTER);
19	@@ -1019,7 +1023,6 @@
20	gtk_container_add(GTK_CONTAINER(prefswin_options_frame), options_table);
21	gtk_container_border_width(GTK_CONTAINER(options_table), 5);
22
23	- GtkWidget * table_rb;
24	table_rb = gtk_table_new(4,4,FALSE);
25
26	options_gi_box = gtk_hbox_new(FALSE, 3);
27	@@ -1110,7 +1113,6 @@
28	prefswin_fonts_vbox = gtk_table_new(4,4,TRUE);
29
30	// This ain't exactly GnomeFontPicker, but we're not a GNOME app so no GNOME widgets for us
31	- GtkWidget *label;
32	label = gtk_label_new("Playlist Font:");
33
34	attrs = pango_attr_list_new ();
35	@@ -1126,7 +1128,7 @@
36
37	prefswin_options_font_browse = gtk_button_new();
38	label_font = gtk_label_new(cfg.playlist_font);
39	- PangoFontDescription * playlist_list_font = pango_font_description_from_string (cfg.playlist_font);
40	+ playlist_list_font = pango_font_description_from_string (cfg.playlist_font);
41	gtk_widget_modify_font(label_font, playlist_list_font);
42	gtk_container_add(GTK_CONTAINER(prefswin_options_font_browse), label_font);
43

Line 0 Link Here

(-)beep-media-player/files/patch-beep::skin.c (+42 lines)
	1	--- beep/skin.c.orig Sat Feb 7 17:42:34 2004
	2	+++ beep/skin.c Sat Feb 7 17:46:18 2004
	3	@@ -168,6 +168,7 @@
	4	const SMID_Mapping *sm_inf;
	5	GdkPixmap *gpm;
	6	gboolean retval = FALSE;
	7	+ SkinPixmap *pm;
	8
	9	if (id >= SKIN_PMID_LAST) {
	10	g_warning("skin pixmap id out of range (%u).", id);
	11	@@ -201,7 +202,7 @@
	12	}
	13	g_free(tmpstr);
	14
	15	- SkinPixmap *pm = &sk->pixmaps[id];
	16	+ pm = &sk->pixmaps[id];
	17	gpm = read_bmp(filename);
	18
	19	if (!gpm) {
	20	@@ -733,9 +734,9 @@
	21	GdkBitmap *skin_get_mask(MaskIndex mi, gboolean doublesize,
	22	gboolean shaded)
	23	{
	24	+ GdkBitmap **masks;
	25	g_assert(skin != NULL);
	26
	27	- GdkBitmap **masks;
	28
	29	g_assert(mi < SKIN_MID_LAST);
	30	masks = (doublesize ? skin->ds_masks : skin->masks);
	31	@@ -813,8 +814,10 @@
	32	gint i;
	33	GdkPixmap *pixmap;
	34	GdkImage *img;
	35	+ SkinPixmap *eqmainpm;
	36	+
	37	g_assert(skin != NULL);
	38	- SkinPixmap *eqmainpm = &skin->pixmaps[SKIN_EQMAIN];
	39	+ eqmainpm = &skin->pixmaps[SKIN_EQMAIN];
	40	if (eqmainpm->pixmap != NULL &&
	41	eqmainpm->current_width >= 116 && eqmainpm->current_height >= 313)
	42	pixmap = eqmainpm->pixmap;

Lines 1-42 Link Here

(-)beep-media-player/files/patch-beep::skinwin.c (-40 / +16 lines)
1	--- beep/skinwin.c.orig Fri Nov 14 05:30:38 2003	1	--- beep/skinwin.c.orig Sat Feb 7 18:16:37 2004
2	+++ beep/skinwin.c Fri Nov 14 05:32:30 2003	2	+++ beep/skinwin.c Sat Feb 7 18:17:50 2004
3	@@ -190,6 +190,10 @@	3	@@ -216,11 +216,12 @@
4	GtkTreeView * treeview = GTK_TREE_VIEW(data);	4	int i;
5	GtkListStore * model;	5	char str, skinsdir;
6	GtkTreeSelection * l_selection;	6	gchar **list;
7	+ guint max;	7	+ GtkTreeView *treeview;
8	+ guint loop;	8	+ GtkTreeSelection *selection = NULL;
9	+ char * comp;	9	+ GtkListStore *store;
10	+
11
12	/* FIXME:
13	* This is all alittle of bad mojo here, the gtk-doc says about the "changed" signal for GtkTreeSelection:
14	@@ -202,10 +206,6 @@
15	if (!gtk_tree_selection_get_selected(GTK_TREE_SELECTION(l_selection),&model,&iter)) return;
16	gtk_tree_model_get (GTK_TREE_MODEL(model), &iter, 1, &name, -1);
17		10
18	- guint max;	11	gtk_widget_set_sensitive(scrolled_win, FALSE);
19	- guint loop;	12	- GtkTreeView *treeview = GTK_TREE_VIEW(data);
20	- char * comp;	13	- GtkTreeSelection *selection = NULL;
21	-	14	- GtkListStore *store;
22	max = g_list_length(skinlist);	15	+ treeview = GTK_TREE_VIEW(data);
23		16
24	for (loop = 0; loop < max; loop++) {	17	selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(treeview));
25	@@ -423,6 +423,8 @@	18	store = GTK_LIST_STORE(gtk_tree_view_get_model(treeview));
26	GtkListStore *store;
27	GtkTreeModel *model;
28
29	+ GtkWidget *selection;
30	+
31	skinwin = gtk_window_new(GTK_WINDOW_TOPLEVEL);
32	gtk_widget_set_usize(skinwin,500,380);
33	gtk_window_set_position(GTK_WINDOW(skinwin),GTK_WIN_POS_CENTER);
34	@@ -493,7 +495,7 @@
35	gtk_tree_view_column_set_spacing(column, 16);
36	gtk_tree_view_column_set_attributes (column, renderer, "text", 1, NULL);
37
38	- GtkWidget *selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (treeview));
39	+ selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (treeview));
40	g_signal_connect(G_OBJECT(selection), "changed", G_CALLBACK(change_skin_event), treeview);
41	g_signal_connect(G_OBJECT(skinwin), "key_press_event", G_CALLBACK(skinwin_keypress_cb), NULL);
42	g_signal_connect(G_OBJECT(skinwin), "show",G_CALLBACK(update_skins),treeview);

Line 0 Link Here

(-)beep-media-player/files/patch-beep::softvolume.c (+16 lines)
	1	--- beep/softvolume.c.orig Sat Feb 7 18:18:57 2004
	2	+++ beep/softvolume.c Sat Feb 7 18:20:03 2004
	3	@@ -27,11 +27,12 @@
	4	void soft_volume_load(char section, SoftVolumeConfig c)
	5	{
	6	ConfigFile *cfgfile;
	7	+ char *sec;
	8
	9	if (c == NULL)
	10	return;
	11
	12	- char *sec = (section == NULL ? "xmms" : section);
	13	+ sec = (section == NULL ? "xmms" : section);
	14
	15	c->enabled = FALSE;
	16	c->volume_left = 0;

Line 0 Link Here

(-)beep-media-player/files/patch-beep::textbox.c (+15 lines)
	1	--- beep/textbox.c.orig Sat Feb 7 17:49:22 2004
	2	+++ beep/textbox.c Sat Feb 7 17:49:58 2004
	3	@@ -142,9 +142,9 @@
	4
	5	void textbox_set_text(TextBox * tb, gchar * text)
	6	{
	7	-
	8	- lock_widget(tb);
	9	- gchar *utf8text;
	10	+ gchar *utf8text;
	11	+
	12	+ lock_widget(tb);
	13	if (tb->tb_text) {
	14	if (!strcmp(text, tb->tb_text)) {
	15	unlock_widget(tb);

Lines 1-75 Link Here

(-)beep-media-player/files/patch-beep::util.c (-75 lines)
1	--- beep/util.c.orig Fri Nov 14 05:06:54 2003
2	+++ beep/util.c Fri Nov 14 05:21:01 2003
3	@@ -707,9 +707,11 @@
4
5	static void filebrowser_add_files(gchar** files, GtkFileSelection * filesel)
6	{
7	+ int ctr = 0;
8	+ char * ptr;
9	+
10	if (GTK_IS_WIDGET(mainwin_jtf)) gtk_widget_set_sensitive(mainwin_jtf,FALSE);
11
12	- int ctr = 0;
13	while(files[ctr] != NULL) {
14	playlist_add(files[ctr++]);
15	}
16	@@ -717,7 +719,6 @@
17
18	if (GTK_IS_WIDGET(mainwin_jtf)) gtk_widget_set_sensitive(mainwin_jtf,TRUE);
19
20	- char * ptr;
21	gtk_label_get(GTK_LABEL(GTK_BIN(filesel->history_pulldown)->child), &ptr);
22
23	/* This will give an extra slash if the current dir is the root. */
24	@@ -726,19 +727,23 @@
25
26	static void filebrowser_ok(GtkWidget * w, GtkWidget * filesel)
27	{
28	+ gchar** files;
29	+
30	if (util_filebrowser_is_dir(GTK_FILE_SELECTION(filesel)))
31	return;
32	- gchar** files = gtk_file_selection_get_selections(GTK_FILE_SELECTION(filesel));
33	+ files = gtk_file_selection_get_selections(GTK_FILE_SELECTION(filesel));
34	filebrowser_add_files(files,GTK_FILE_SELECTION(filesel));
35	gtk_widget_destroy(filesel);
36	}
37
38	static void filebrowser_play(GtkWidget * w, GtkWidget * filesel)
39	{
40	+ gchar** files;
41	+
42	if (util_filebrowser_is_dir(GTK_FILE_SELECTION(GTK_FILE_SELECTION(filesel))))
43	return;
44	playlist_clear();
45	- gchar** files = gtk_file_selection_get_selections(GTK_FILE_SELECTION(filesel));
46	+ files = gtk_file_selection_get_selections(GTK_FILE_SELECTION(filesel));
47	filebrowser_add_files(files,GTK_FILE_SELECTION(filesel));
48	gtk_widget_destroy(filesel);
49	playlist_play();
50	@@ -746,8 +751,10 @@
51
52	static void filebrowser_add_selected_files(GtkWidget * w, gpointer data)
53	{
54	+ gchar** files;
55	+
56	GtkFileSelection *filesel = GTK_FILE_SELECTION(data);
57	- gchar** files = gtk_file_selection_get_selections(filesel);
58	+ files = gtk_file_selection_get_selections(filesel);
59
60	filebrowser_add_files(files,filesel);
61	gtk_tree_selection_unselect_all(gtk_tree_view_get_selection(GTK_TREE_VIEW(filesel->file_list)));
62	@@ -758,10 +765,12 @@
63
64	static void filebrowser_add_all_files(GtkWidget * w, gpointer data)
65	{
66	+ gchar** files;
67	GtkFileSelection * filesel;
68	+
69	filesel = data;
70	gtk_tree_selection_select_all(gtk_tree_view_get_selection(GTK_TREE_VIEW(filesel->file_list)));
71	- gchar** files = gtk_file_selection_get_selections(filesel);
72	+ files = gtk_file_selection_get_selections(filesel);
73	filebrowser_add_files(files,filesel);
74	gtk_tree_selection_unselect_all(gtk_tree_view_get_selection(GTK_TREE_VIEW(filesel->file_list)));
75	gtk_entry_set_text(GTK_ENTRY(filesel->selection_entry), "");

Lines 1-51 Link Here

(-)beep-media-player/files/patch-ltmain.sh (-51 lines)
1	--- ltmain.sh.orig Fri Nov 14 05:04:28 2003
2	+++ ltmain.sh Fri Nov 14 05:04:28 2003
3	@@ -1075,7 +1075,7 @@
4	esac
5	elif test "X$arg" = "X-lc_r"; then
6	case $host in
7	- --openbsd* \| --freebsd*)
8	+ --openbsd* \| --freebsd4*)
9	# Do not include libc_r directly, use -pthread flag.
10	continue
11	;;
12	@@ -1085,8 +1085,16 @@
13	continue
14	;;
15
16	+ -pthread)
17	+ compile_command="$compile_command -pthread"
18	+ finalize_command="$finalize_command -pthread"
19	+ compiler_flags="$compiler_flags -pthread"
20	+ continue
21	+ ;;
22	+
23	-module)
24	module=yes
25	+ build_old_libs=no
26	continue
27	;;
28
29	@@ -2506,6 +2514,9 @@
30	--openbsd* \| --freebsd*)
31	# Do not include libc due to us having libc/libc_r.
32	;;
33	+ --freebsd*)
34	+ # FreeBSD doesn't need this...
35	+ ;;
36	*)
37	# Add libc to deplibs on all other systems if necessary.
38	if test $build_libtool_need_lc = "yes"; then
39	@@ -4333,10 +4344,12 @@
40	fi
41
42	# Install the pseudo-library for information purposes.
43	+ if /usr/bin/false; then
44	name=`$echo "X$file" \| $Xsed -e 's%^.*/%%'`
45	instname="$dir/$name"i
46	$show "$install_prog $instname $destdir/$name"
47	$run eval "$install_prog $instname $destdir/$name" \|\| exit $?
48	+ fi
49
50	# Maybe install the static library, too.
51	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"

Lines 4-27 Link Here

(-)beep-media-player/pkg-plist (-14 / +48 lines)
4	include/beep/configfile.h	4	include/beep/configfile.h
5	include/beep/dirbrowser.h	5	include/beep/dirbrowser.h
6	include/beep/formatter.h	6	include/beep/formatter.h
7	include/beep/fullscreen.h	7	include/bmp/fullscreen.h
8	include/beep/plugin.h	8	include/bmp/plugin.h
9	include/beep/titlestring.h	9	include/beep/titlestring.h
10	include/beep/util.h	10	include/beep/util.h
11	lib/libbeep.a	11	lib/libbeep.a
		12	lib/libbeep.la
12	lib/libbeep.so	13	lib/libbeep.so
13	lib/libbeep.so.1	14	lib/libbeep.so.1
14	lib/beep/Input/libcdaudio.so	15	lib/bmp/Input/libcdaudio.so
15	lib/beep/Input/libmpg123.so	16	lib/bmp/Input/libcdaudio.la
16	%%VORBISPLUGIN:%%lib/beep/Input/libvorbis.so	17	lib/bmp/Input/libmpg123.so
17	lib/beep/Output/libOSS.so	18	lib/bmp/Input/libmpg123.la
18	%%ESDPLUGIN:%%lib/beep/Output/libesdout.so	19	%%VORBISPLUGIN:%%lib/bmp/Input/libvorbis.so
19	lib/beep/Visualization/libbscope.so	20	%%VORBISPLUGIN:%%lib/bmp/Input/libvorbis.la
		21	lib/bmp/Output/libOSS.so
		22	lib/bmp/Output/libOSS.la
		23	%%ESDPLUGIN:%%lib/bmp/Output/libesdout.so
		24	%%ESDPLUGIN:%%lib/bmp/Output/libesdout.la
		25	lib/bmp/Visualization/libbscope.so
		26	lib/bmp/Visualization/libbscope.la
		27	lib/pkgconfig/beep.pc
20	share/aclocal/beep.m4	28	share/aclocal/beep.m4
21	@dirrm share/beep/Skins	29	share/bmp/Skins/Default/Avs.bmp
22	@dirrm share/beep	30	share/bmp/Skins/Default/Balance.bmp
23	@dirrm lib/beep/Visualization	31	share/bmp/Skins/Default/Eq_ex.bmp
24	@dirrm lib/beep/Output	32	share/bmp/Skins/Default/Eqmain.bmp
25	@dirrm lib/beep/Input	33	share/bmp/Skins/Default/Main.bmp
26	@dirrm lib/beep	34	share/bmp/Skins/Default/Mb.bmp
		35	share/bmp/Skins/Default/Monoster.bmp
		36	share/bmp/Skins/Default/Nums_ex.bmp
		37	share/bmp/Skins/Default/Pledit.bmp
		38	share/bmp/Skins/Default/Posbar.bmp
		39	share/bmp/Skins/Default/Shufrep.bmp
		40	share/bmp/Skins/Default/Text.bmp
		41	share/bmp/Skins/Default/Titlebar.bmp
		42	share/bmp/Skins/Default/Volume.bmp
		43	share/bmp/Skins/Default/cButtons.bmp
		44	share/bmp/Skins/Default/pLaypaus.bmp
		45	share/bmp/Skins/Default/pLedit.txt
		46	share/bmp/Skins/Default/readme.txt
		47	share/bmp/Skins/Default/screenshot.bmp
		48	share/bmp/Skins/Default/vIscolor.txt
		49	share/bmp/beep_logo.xpm
		50	share/bmp/beep.svg
		51	share/applications/beep.desktop
		52	share/locale/fr/LC_MESSAGES/bmp.mo
		53	@dirrm share/bmp/Skins/Default
		54	@dirrm share/bmp/Skins
		55	@dirrm share/bmp
		56	@dirrm lib/bmp/Visualization
		57	@dirrm lib/bmp/Output
		58	@dirrm lib/bmp/Input
		59	@dirrm lib/bmp
		60	@dirrm include/bmp
27	@dirrm include/beep	61	@dirrm include/beep