+++ /dev/null
-# ChangeLog for media-plugins/xmms-xmmsmplayer
-# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/xmms-xmmsmplayer/ChangeLog,v 1.11 2006/01/12 01:27:12 metalgod Exp $
-
-*xmms-xmmsmplayer-0.5-r2 (12 Jan 2006)
-
- 12 Jan 2006; Luis Medinas <metalgod@gentoo.org>
- +files/xmms-xmmsmplayer-0.5-sigsegvfix.patch,
- +xmms-xmmsmplayer-0.5-r2.ebuild:
- Added a patch to fix sigsegv when running thanks to Jon Dowdall
- <jon.dowdall@bigpond.com> fixes bug #92104. ~amd64 keyword re-added.
-
- 03 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
- xmms-xmmsmplayer-0.5.ebuild, xmms-xmmsmplayer-0.5-r1.ebuild:
- Don't install COPYING file.
-
-*xmms-xmmsmplayer-0.5-r1 (04 May 2005)
-
- 04 May 2005; Jeremy Huddleston <eradicator@gentoo.org>
- +xmms-xmmsmplayer-0.5-r1.ebuild:
- Filter valid extensions to use this plugin for. Closes bug #81690 thanks to
- James Le Cuirot <chewi@ffaura.com>.
-
- 28 Mar 2005; Alex Howells <astinus@gentoo.org> xmms-xmmsmplayer-0.5.ebuild:
- Seems to work for quite a few users, last reported failure was eradicator in
- June 2004. Going to keyword ~amd64, would like to hear feedback from AMD64
- users who've tested it out and had it work/fail. This is with regard to Bug
- 86944.
-
- 13 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
- xmms-xmmsmplayer-0.5.ebuild:
- Stable x86
-
- 07 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
- xmms-xmmsmplayer-0.5.ebuild:
- ~sparc
-
- 15 Jun 2004; Jeremy Huddleston <eradicator@gentoo.org>
- xmms-xmmsmplayer-0.5.ebuild:
- Testedon amd64, but failed. Video plays, but no audio. X hangs when closing
- xmms while playing video (but mplayer command line works fine).
-
- 08 Jun 2004; David Holm <dholm@gentoo.org> xmms-xmmsmplayer-0.5.ebuild:
- Added to ~ppc.
-
-*xmms-xmmsmplayer-0.5 (07 Jun 2004)
-
- 07 Jun 2004; Jeremy Huddleston <eradicator@gentoo.org> metadata.xml,
- xmms-xmmsmplayer-0.5.ebuild:
- Ebuild submitted by Joseph Turian <turian@gmail.com> in bug #52810.
-
+++ /dev/null
-AUX exts-filter.patch 7597 RMD160 b9f27225b50f758cde0d9f44772518baf56191a4 SHA1 6cdbbc1aaf263a603c5f6222fa3da9f9e2ab1319 SHA256 8ec232f36e09d88d7cd9072881f554b9a0844d8447e02364275f6a1b09cd66c3
-MD5 4e43eabdfe813855a2c9b5d4e182c65b files/exts-filter.patch 7597
-RMD160 b9f27225b50f758cde0d9f44772518baf56191a4 files/exts-filter.patch 7597
-SHA256 8ec232f36e09d88d7cd9072881f554b9a0844d8447e02364275f6a1b09cd66c3 files/exts-filter.patch 7597
-AUX xmms-xmmsmplayer-0.5-sigsegvfix.patch 589 RMD160 fdc456e873d851d7acc701a2e033a241ae1f9f2a SHA1 f8d916999c539ab3444649103e4bb5d4d173a064 SHA256 733fcec082c9b4e25cf097f7fcc71cb17405da9d4fc20b71eb4a1acd20a23d92
-MD5 45a9a154b726f1f74deb37c8c36fbe4f files/xmms-xmmsmplayer-0.5-sigsegvfix.patch 589
-RMD160 fdc456e873d851d7acc701a2e033a241ae1f9f2a files/xmms-xmmsmplayer-0.5-sigsegvfix.patch 589
-SHA256 733fcec082c9b4e25cf097f7fcc71cb17405da9d4fc20b71eb4a1acd20a23d92 files/xmms-xmmsmplayer-0.5-sigsegvfix.patch 589
-DIST xmmsmplayer-0.5.tar.gz 230696
-EBUILD xmms-xmmsmplayer-0.5-r1.ebuild 931 RMD160 7d10e05acfb30fdc7dc9d7fd02ea82cbc8d623c6 SHA1 8f19d189719418cb084cd24eb8e7950639a59350 SHA256 025b84d51f21792b05a9590cdb8082872e0922f4467af05f9a7395a21f8a9328
-MD5 784a27d1e1a1c9d81b28c14e95ec8359 xmms-xmmsmplayer-0.5-r1.ebuild 931
-RMD160 7d10e05acfb30fdc7dc9d7fd02ea82cbc8d623c6 xmms-xmmsmplayer-0.5-r1.ebuild 931
-SHA256 025b84d51f21792b05a9590cdb8082872e0922f4467af05f9a7395a21f8a9328 xmms-xmmsmplayer-0.5-r1.ebuild 931
-EBUILD xmms-xmmsmplayer-0.5-r2.ebuild 972 RMD160 85663f241fe520b1324d2c9cc411a57816192ab0 SHA1 404e4775269db73af31d7b73d79523513c3e7110 SHA256 0f7ae233509a2ae0cc521f03abd7f6941145faab4bbd71420651a12a55a28f28
-MD5 b5f641ab80d0ef30e612943432ff6c58 xmms-xmmsmplayer-0.5-r2.ebuild 972
-RMD160 85663f241fe520b1324d2c9cc411a57816192ab0 xmms-xmmsmplayer-0.5-r2.ebuild 972
-SHA256 0f7ae233509a2ae0cc521f03abd7f6941145faab4bbd71420651a12a55a28f28 xmms-xmmsmplayer-0.5-r2.ebuild 972
-EBUILD xmms-xmmsmplayer-0.5.ebuild 910 RMD160 52cc9b49cd80e1a14d26715ec7b726c1855d4a70 SHA1 b10d2984aad8b75994521d26f9fca914072d5ec3 SHA256 1b2a95b462490b61afdab43f8d76ff9b197dca1f0a0578c80f5c3f4aa75e8044
-MD5 53d848d791bab4a28da28266cf8c189d xmms-xmmsmplayer-0.5.ebuild 910
-RMD160 52cc9b49cd80e1a14d26715ec7b726c1855d4a70 xmms-xmmsmplayer-0.5.ebuild 910
-SHA256 1b2a95b462490b61afdab43f8d76ff9b197dca1f0a0578c80f5c3f4aa75e8044 xmms-xmmsmplayer-0.5.ebuild 910
-MISC ChangeLog 2000 RMD160 06f12e76d97b38e29c72802482b61d98ec5de9d3 SHA1 52874a547c6dd5a40f26ba516688d1b838d9926a SHA256 dbfc09f6de530cb447d103d0cfe244fab278d890c3370917ce974187e97c52d2
-MD5 89bb1f8bdc30c1df887cc114551675e5 ChangeLog 2000
-RMD160 06f12e76d97b38e29c72802482b61d98ec5de9d3 ChangeLog 2000
-SHA256 dbfc09f6de530cb447d103d0cfe244fab278d890c3370917ce974187e97c52d2 ChangeLog 2000
-MISC metadata.xml 177 RMD160 198b70627ff2497bddd0a381069abafea8b14ae5 SHA1 dc1cf9e47733b7b16cc1bf5eca6e7b4292891846 SHA256 fbe4df42485e5215a09c2a0b7ff74408d90276993544a49df84dbe759343abc9
-MD5 223dfdc3e10800dbb22bad28c928b52a metadata.xml 177
-RMD160 198b70627ff2497bddd0a381069abafea8b14ae5 metadata.xml 177
-SHA256 fbe4df42485e5215a09c2a0b7ff74408d90276993544a49df84dbe759343abc9 metadata.xml 177
-MD5 1b7ac53d1d91e6e03452da584d63d8c3 files/digest-xmms-xmmsmplayer-0.5 67
-RMD160 d38a6869d45562325a1d90f767f7e51282e881ee files/digest-xmms-xmmsmplayer-0.5 67
-SHA256 b674038731241bea410964e4563806cde3feaaf4a11297a01c442500fd828c51 files/digest-xmms-xmmsmplayer-0.5 67
-MD5 1b7ac53d1d91e6e03452da584d63d8c3 files/digest-xmms-xmmsmplayer-0.5-r1 67
-RMD160 d38a6869d45562325a1d90f767f7e51282e881ee files/digest-xmms-xmmsmplayer-0.5-r1 67
-SHA256 b674038731241bea410964e4563806cde3feaaf4a11297a01c442500fd828c51 files/digest-xmms-xmmsmplayer-0.5-r1 67
-MD5 1b7ac53d1d91e6e03452da584d63d8c3 files/digest-xmms-xmmsmplayer-0.5-r2 67
-RMD160 d38a6869d45562325a1d90f767f7e51282e881ee files/digest-xmms-xmmsmplayer-0.5-r2 67
-SHA256 b674038731241bea410964e4563806cde3feaaf4a11297a01c442500fd828c51 files/digest-xmms-xmmsmplayer-0.5-r2 67
+++ /dev/null
-diff -Naur xmmsmplayer-0.5_old/xmmsmplayer/common.c xmmsmplayer-0.5_new/xmmsmplayer/common.c
---- xmmsmplayer-0.5_old/xmmsmplayer/common.c 2003-05-20 15:21:16.000000000 +0100
-+++ xmmsmplayer-0.5_new/xmmsmplayer/common.c 2005-02-25 14:58:46.191127339 +0000
-@@ -14,6 +14,7 @@
- xmms_cfg_read_boolean(cfg,"xmms-mplayer","idx",&(new_cfg->idx));
- xmms_cfg_read_boolean(cfg,"xmms-mplayer","onewin",&(new_cfg->onewin));
- xmms_cfg_read_boolean(cfg,"xmms-mplayer","xmmsaudio",&(new_cfg->xmmsaudio));
-+ xmms_cfg_read_string(cfg,"xmms-mplayer","exts",&(new_cfg->exts));
- xmms_cfg_read_string(cfg,"xmms-mplayer","extra",&(new_cfg->extra));
- return new_cfg;
- }
-diff -Naur xmmsmplayer-0.5_old/xmmsmplayer/interface.c xmmsmplayer-0.5_new/xmmsmplayer/interface.c
---- xmmsmplayer-0.5_old/xmmsmplayer/interface.c 2004-03-30 15:24:18.000000000 +0100
-+++ xmmsmplayer-0.5_new/xmmsmplayer/interface.c 2005-02-25 15:00:38.498443708 +0000
-@@ -32,6 +32,7 @@
- static GtkWidget *ao_esd;
- static GtkWidget *ao_alsa;
- static GtkWidget *ao_sdl;
-+static GtkWidget *entry_exts;
- static GtkWidget *entry_extra_opts;
-
- static GtkWidget *mplayer_configure_win = NULL;
-@@ -80,6 +81,7 @@
- new_cfg.xmmsaudio=gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(opt_xmmsaudio));
- if(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(opt_xmmsaudio)))
- new_cfg.ao=MPLAYER_AO_XMMS;
-+ new_cfg.exts=gtk_entry_get_text(GTK_ENTRY(entry_exts));
- new_cfg.extra=gtk_entry_get_text(GTK_ENTRY(entry_extra_opts));
-
- cfg = xmms_cfg_open_default_file();
-@@ -90,9 +92,12 @@
- xmms_cfg_write_boolean(cfg,"xmms-mplayer","idx",new_cfg.idx);
- xmms_cfg_write_boolean(cfg,"xmms-mplayer","onewin",new_cfg.onewin);
- xmms_cfg_write_boolean(cfg,"xmms-mplayer","xmmsaudio",new_cfg.xmmsaudio);
-+ xmms_cfg_write_string(cfg,"xmms-mplayer","exts",new_cfg.exts);
- xmms_cfg_write_string(cfg,"xmms-mplayer","extra",new_cfg.extra);
- xmms_cfg_write_default_file(cfg);
- xmms_cfg_free(cfg);
-+
-+ mplayer_update_cfg();
-
- gtk_widget_destroy(mplayer_configure_win);
- mplayer_configure_win=NULL;
-@@ -119,6 +124,7 @@
- GtkWidget *label_other;
- GtkWidget *scrolledwindow5;
- GtkWidget *layout5;
-+ GtkWidget *label_exts;
- GtkWidget *label_extra_des;
- GtkWidget *label_extra;
- GtkWidget *btn_ok;
-@@ -389,12 +395,30 @@
- GTK_ADJUSTMENT (GTK_LAYOUT (layout5)->hadjustment)->step_increment = 10;
- GTK_ADJUSTMENT (GTK_LAYOUT (layout5)->vadjustment)->step_increment = 10;
-
-+ entry_exts = gtk_entry_new ();
-+ gtk_widget_ref (entry_exts);
-+ gtk_object_set_data_full (GTK_OBJECT (window1), "entry_exts", entry_exts,
-+ (GtkDestroyNotify) gtk_widget_unref);
-+ gtk_widget_show (entry_exts);
-+ gtk_layout_put (GTK_LAYOUT (layout5), entry_exts, 40, 128);
-+ gtk_widget_set_usize (entry_exts, 392, 24);
-+
-+ label_exts = gtk_label_new ("Specify the file types that you DON'T want\nthe plugin to play here. These must be\nseparated by spaces. Don't include the dots.");
-+ gtk_widget_ref (label_exts);
-+ gtk_object_set_data_full (GTK_OBJECT (window1), "label_exts", label_exts,
-+ (GtkDestroyNotify) gtk_widget_unref);
-+ gtk_widget_show (label_exts);
-+ gtk_layout_put (GTK_LAYOUT (layout5), label_exts, 40, 48);
-+ gtk_widget_set_usize (label_exts, 392, 64);
-+ gtk_label_set_justify (GTK_LABEL (label_exts), GTK_JUSTIFY_LEFT);
-+ gtk_misc_set_alignment (GTK_MISC (label_exts), 0.18, 1);
-+
- entry_extra_opts = gtk_entry_new ();
- gtk_widget_ref (entry_extra_opts);
- gtk_object_set_data_full (GTK_OBJECT (window1), "entry_extra_opts", entry_extra_opts,
- (GtkDestroyNotify) gtk_widget_unref);
- gtk_widget_show (entry_extra_opts);
-- gtk_layout_put (GTK_LAYOUT (layout5), entry_extra_opts, 40, 192);
-+ gtk_layout_put (GTK_LAYOUT (layout5), entry_extra_opts, 40, 224);
- gtk_widget_set_usize (entry_extra_opts, 392, 24);
-
- label_extra_des = gtk_label_new ("Extra options for mplayer can be added here.\nParsing is done based on spaces.\nQuotes and escapes are not recognised yet.");
-@@ -403,7 +427,7 @@
- (GtkDestroyNotify) gtk_widget_unref);
- gtk_widget_show (label_extra_des);
- gtk_layout_put (GTK_LAYOUT (layout5), label_extra_des, 40, 48);
-- gtk_widget_set_usize (label_extra_des, 392, 128);
-+ gtk_widget_set_usize (label_extra_des, 392, 160);
- gtk_label_set_justify (GTK_LABEL (label_extra_des), GTK_JUSTIFY_LEFT);
- gtk_misc_set_alignment (GTK_MISC (label_extra_des), 0.18, 1);
-
-@@ -494,5 +518,6 @@
- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (ao_alsa), TRUE);
- break;
- }
-+ gtk_entry_set_text(GTK_ENTRY(entry_exts),cfg->exts);
- gtk_entry_set_text(GTK_ENTRY(entry_extra_opts),cfg->extra);
- }
-diff -Naur xmmsmplayer-0.5_old/xmmsmplayer/xmmsmplayer.c xmmsmplayer-0.5_new/xmmsmplayer/xmmsmplayer.c
---- xmmsmplayer-0.5_old/xmmsmplayer/xmmsmplayer.c 2003-09-28 22:18:51.000000000 +0100
-+++ xmmsmplayer-0.5_new/xmmsmplayer/xmmsmplayer.c 2005-02-25 15:00:15.243312470 +0000
-@@ -76,32 +76,41 @@
- }
-
- void mplayer_init(){
-- /*Add read configure!! */
-+ mplayer_update_cfg();
-+}
-
-- /*mplayer_playing=0;*/
-+void mplayer_update_cfg(){
-+ mplayer_debugf("debug- reading configfile\n");
-+ if (mplayer_current_cfg){
-+ g_free(mplayer_current_cfg->exts);
-+ g_free(mplayer_current_cfg->extra);
-+ g_free(mplayer_current_cfg);
-+ }
-+ mplayer_current_cfg=mplayer_read_cfg();
- }
-+
- int mplayer_is_our_file(char *filename){
- gchar *ext;
- ext = strrchr(filename, '.');
-- if (ext){
-- if((!strcasecmp(ext, ".mpg")) ||
-- (!strcasecmp(ext, ".mpeg")) ||
-- (!strcasecmp(ext, ".divx")) ||
-- (!strcasecmp(ext, ".qt")) ||
-- (!strcasecmp(ext, ".mov")) ||
-- (!strcasecmp(ext, ".mp2")) ||
-- (!strcasecmp(ext, ".mpa")) ||
-- (!strcasecmp(ext, ".dat")) ||
-- (!strcasecmp(ext, ".rm")) ||
-- (!strcasecmp(ext, ".swf")) ||
-- (!strcasecmp(ext, ".wma")) ||
-- (!strcasecmp(ext, ".wmv")) ||
-- (!strcasecmp(ext, ".wmp")) ||
-- (!strcasecmp(ext, ".asf")) ||
-- (!strcasecmp(ext, ".avi"))
-- ) return TRUE;
-+ ext++;
-+
-+ char *tok;
-+ char *exts = strdup(mplayer_current_cfg->exts);
-+
-+ strcpy(exts, mplayer_current_cfg->exts);
-+ tok = strtok(exts, " ");
-+
-+ while (tok != NULL){
-+ if (!strcasecmp(ext, tok)) {
-+ free(exts);
-+ return FALSE;
-+ }
-+
-+ tok = strtok(NULL, " ");
- }
-- return FALSE;
-+
-+ free(exts);
-+ return TRUE;
- }
- void mplayer_play_file(char *filename){
- pthread_attr_t tattr;
-@@ -130,12 +139,6 @@
- mplayer_current_info->rate,
- mplayer_current_info->nch);
- mplayer_debugf("debug-play-sent-info\n");
-- mplayer_debugf("debug- reading configfile\n");
-- if (mplayer_current_cfg){
-- g_free(mplayer_current_cfg->extra);
-- g_free(mplayer_current_cfg);
-- }
-- mplayer_current_cfg=mplayer_read_cfg();
- if(mplayer_current_cfg->onewin &&(!mplayer_video)){
- /* mplayer_video=gtk_window_new(GTK_WINDOW_DIALOG);
- gtk_widget_set_usize(GTK_WIDGET(mplayer_video), 320, 240);
-diff -Naur xmmsmplayer-0.5_old/xmmsmplayer/xmmsmplayer.h xmmsmplayer-0.5_new/xmmsmplayer/xmmsmplayer.h
---- xmmsmplayer-0.5_old/xmmsmplayer/xmmsmplayer.h 2003-05-30 23:19:11.000000000 +0100
-+++ xmmsmplayer-0.5_new/xmmsmplayer/xmmsmplayer.h 2005-02-25 15:02:15.049381334 +0000
-@@ -60,6 +60,7 @@
- struct mplayer_cfg{
- gint vo,ao;
- gboolean zoom,framedrop,idx,onewin,xmmsaudio;
-+ gchar *exts;
- gchar *extra;
- };
-
-@@ -79,6 +80,7 @@
- gint mplayer_get_time();
- void mplayer_get_song_info(char * filename, char ** title, int * length);
- void mplayer_init();
-+void mplayer_update_cfg();
- InputPlugin *get_iplugin_info(void);
-
- void on_button_ok_clicked (GtkButton *button, gpointer user_data);