summaryrefslogtreecommitdiffstats
path: root/patches/xmms/plugins
diff options
context:
space:
mode:
Diffstat (limited to 'patches/xmms/plugins')
-rw-r--r--patches/xmms/plugins/xmms-ds-mpg123-editor-keys.patch164
-rw-r--r--patches/xmms/plugins/xmms-ds-mpg123-editor.patch202
-rw-r--r--patches/xmms/plugins/xmms-ds-mpg123.patch20
-rw-r--r--patches/xmms/plugins/xmms-ds-vorbis-editor-keys.patch78
-rw-r--r--patches/xmms/plugins/xmms-ds-vorbis-editor.patch51
-rw-r--r--patches/xmms/plugins/xmms-wma-csa1.tar.bz2bin0 -> 20480 bytes
6 files changed, 0 insertions, 515 deletions
diff --git a/patches/xmms/plugins/xmms-ds-mpg123-editor-keys.patch b/patches/xmms/plugins/xmms-ds-mpg123-editor-keys.patch
deleted file mode 100644
index 38a74e2..0000000
--- a/patches/xmms/plugins/xmms-ds-mpg123-editor-keys.patch
+++ /dev/null
@@ -1,164 +0,0 @@
-diff -dPNur rusxmms-new/Input/mpg123/fileinfo.c rusxmms-new-keys/Input/mpg123/fileinfo.c
---- rusxmms-new/Input/mpg123/fileinfo.c 2005-07-17 11:46:05.000000000 +0200
-+++ rusxmms-new-keys/Input/mpg123/fileinfo.c 2005-07-18 01:12:36.000000000 +0200
-@@ -31,6 +31,10 @@
- #define MAX_STR_LEN 100
- #define MAX_ENTRY_LEN2 1023
-
-+#include <gdk/gdkkeysyms.h>
-+#include <gdk/gdktypes.h>
-+#include "../../xmms/xmms.h"
-+
- static GtkWidget *window = NULL;
- static GtkWidget *notebook = NULL;
- static GtkWidget *filename_entry, *id3v1_frame, *id3v2_frame;
-@@ -507,6 +511,106 @@
- gtk_widget_destroy(w);
- }
-
-+static int restore_focus;
-+static GtkWidget *save;
-+
-+
-+static GtkWidget **widgets1[] = { &v1_title_entry, &v1_artist_entry, &v1_album_entry, &v1_comment_entry, &v1_year_entry, NULL };
-+static GtkWidget **widgets2[] = { &v2_title_entry, &v2_artist_entry, &v2_album_entry, &v2_comment_entry, &v2_year_entry, &v2_composer_entry, &v2_orig_artist_entry, &v2_url_entry, &v2_encoded_by_entry, NULL };
-+/* Info: gdktypes.h, gdkkeysyms.h */
-+gboolean mpg123_keypress_cb(GtkWidget * w, GdkEventKey * event, gpointer close) {
-+ gint pos;
-+ GtkWidget ***widgets, *widget, *focused;
-+
-+ switch(event->keyval) {
-+ case GDK_Return:
-+ restore_focus=1;
-+ gtk_signal_emit_by_name(GTK_OBJECT(save), "clicked", NULL);
-+ gtk_signal_emit_by_name(GTK_OBJECT(close), "clicked", NULL);
-+ return TRUE;
-+ break;
-+ case GDK_Escape:
-+ restore_focus=1;
-+ return TRUE;
-+ break;
-+ }
-+
-+ if (event->state&GDK_CONTROL_MASK) {
-+ switch(event->keyval) {
-+ case GDK_Left:
-+ gtk_notebook_prev_page(GTK_NOTEBOOK(notebook));
-+ pos = gtk_notebook_get_current_page(GTK_NOTEBOOK(notebook));
-+ if (pos == 0) gtk_window_set_focus(GTK_WINDOW(window), *widgets2[0]);
-+ else if (pos == 1) gtk_window_set_focus(GTK_WINDOW(window), *widgets1[0]);
-+ gtk_window_activate_focus(GTK_WINDOW(window));
-+ return TRUE;
-+ break;
-+ case GDK_Right:
-+ gtk_notebook_next_page(GTK_NOTEBOOK(notebook));
-+ pos = gtk_notebook_get_current_page(GTK_NOTEBOOK(notebook));
-+ if (pos == 0) gtk_window_set_focus(GTK_WINDOW(window), *widgets2[0]);
-+ else if (pos == 1) gtk_window_set_focus(GTK_WINDOW(window), *widgets1[0]);
-+ gtk_window_activate_focus(GTK_WINDOW(window));
-+ return TRUE;
-+ break;
-+ }
-+ }
-+ {
-+ switch(event->keyval) {
-+ case GDK_Page_Up:
-+ pos = gtk_notebook_get_current_page(GTK_NOTEBOOK(notebook));
-+
-+ focused = GTK_WINDOW(window)->focus_widget;
-+ if (pos == 1) widgets = widgets1;
-+ else if (pos == 0) widgets = widgets2;
-+ else return FALSE;
-+
-+ for (pos = 0; widgets[pos]; pos++) {
-+ if (focused == *widgets[pos]) {
-+ if (pos == 0) {
-+ while (widgets[pos+1]) pos++;
-+ widget = *widgets[pos];
-+ } else widget = *widgets[pos - 1];
-+
-+ gtk_window_set_focus(GTK_WINDOW(window), widget);
-+ return TRUE;
-+ }
-+ }
-+ break;
-+ case GDK_Page_Down:
-+ case GDK_Tab:
-+ pos = gtk_notebook_get_current_page(GTK_NOTEBOOK(notebook));
-+
-+ focused = GTK_WINDOW(window)->focus_widget;
-+ if (pos == 1) widgets = widgets1;
-+ else if (pos == 0) widgets = widgets2;
-+ else return FALSE;
-+
-+ for (pos = 0; widgets[pos]; pos++) {
-+ if (focused == *widgets[pos]) {
-+ if (widgets[pos + 1]) widget = *widgets[pos + 1];
-+ else widget = *widgets[0];
-+
-+ gtk_window_set_focus(GTK_WINDOW(window), widget);
-+ return TRUE;
-+ }
-+ }
-+
-+ break;
-+ }
-+ }
-+
-+ return FALSE;
-+}
-+
-+void gtk_widget_destroyed_focus(GtkWidget *widget, GtkWidget **widget_pointer) {
-+ gtk_widget_destroyed(widget,widget_pointer);
-+ if (restore_focus) {
-+ gtk_widget_hide(playlistwin);
-+ gtk_widget_show(playlistwin);
-+ }
-+}
-+
- void mpg123_file_info_box(char *filename)
- {
- int i;
-@@ -517,6 +621,8 @@
- const char *emphasis[4];
- const char *bool_label[2];
-
-+ restore_focus = 0;
-+
- emphasis[0] = _("None");
- emphasis[1] = _("50/15 ms");
- emphasis[2] = "";
-@@ -529,15 +635,16 @@
- GtkWidget *window_vbox,
- *id3v1_vbox, *id3v2_vbox, *id3v1_frame_vbox, *id3v2_frame_vbox,
- *mpeg_lvbox, *mpeg_rvbox, *mpeg_hbox, *mpeg_box, *mpeg_frame,
-- *bbox, *save, *close, *copy_to, *copy_from,
-+ *bbox, *close, *copy_to, *copy_from,
- *table, *label, *filename_hbox;
-+ GtkAccelGroup *ag;
-
- v1_labels_list = g_ptr_array_new();
- v2_labels_list = g_ptr_array_new();
-
- window = gtk_window_new(GTK_WINDOW_DIALOG);
-- gtk_signal_connect(GTK_OBJECT(window), "destroy", GTK_SIGNAL_FUNC(gtk_widget_destroyed), &window);
-- gtk_signal_connect(GTK_OBJECT(window), "key_press_event", file_info_box_keypress_cb, NULL);
-+ gtk_signal_connect(GTK_OBJECT(window), "destroy", GTK_SIGNAL_FUNC(gtk_widget_destroyed_focus), &window);
-+// gtk_signal_connect(GTK_OBJECT(window),"key_press_event",file_info_box_keypress_cb, NULL);
- gtk_container_set_border_width(GTK_CONTAINER(window), 10);
-
- window_vbox = gtk_vbox_new(FALSE,10);
-@@ -916,6 +1023,13 @@
- GTK_SIGNAL_FUNC(gtk_widget_destroy), GTK_OBJECT(window));
- gtk_box_pack_start(GTK_BOX(bbox), close, TRUE, TRUE, 5);
-
-+ ag = gtk_accel_group_new();
-+ gtk_accel_group_add(ag, GDK_Escape, 0, 0, GTK_OBJECT(close), "clicked");
-+ gtk_accel_group_add(ag, GDK_Return, 0, 0, GTK_OBJECT(save), "clicked");
-+ gtk_window_add_accel_group(GTK_WINDOW(window), ag);
-+
-+ gtk_signal_connect(GTK_OBJECT(window), "key_press_event", GTK_SIGNAL_FUNC(mpg123_keypress_cb), close);
-+
- gtk_container_add(GTK_CONTAINER(window), window_vbox);
- gtk_widget_show_all(window);
- }
diff --git a/patches/xmms/plugins/xmms-ds-mpg123-editor.patch b/patches/xmms/plugins/xmms-ds-mpg123-editor.patch
deleted file mode 100644
index a4afb70..0000000
--- a/patches/xmms/plugins/xmms-ds-mpg123-editor.patch
+++ /dev/null
@@ -1,202 +0,0 @@
-diff -dPNur xmms-1.2.10/Input/mpg123/fileinfo.c xmms-1.2.10-new/Input/mpg123/fileinfo.c
---- rusxmms/Input/mpg123/fileinfo.c 2005-07-17 01:54:55.000000000 +0200
-+++ rusxmms-new/Input/mpg123/fileinfo.c 2005-07-17 11:46:05.000000000 +0200
-@@ -24,6 +24,7 @@
- #include <string.h>
- #include <errno.h>
- #include <libxmms/xentry.h>
-+#include <libxmms/rcc.h>
- #include <gdk/gdkkeysyms.h>
- #include "mpg123.h"
-
-@@ -60,19 +61,33 @@
-
- static void set_entry_tag_v1(GtkEntry * entry, const char * tag, int length)
- {
-- char *text = g_strchomp(g_strndup(tag, length));
-+ char *text;
-+
-+ text = xmms_rcc_sized_recode(XMMS_RCC_ID3, XMMS_RCC_CTYPE, tag, length);
-+ if (!text) text = g_strchomp(g_strndup(tag, length));
-+
- gtk_entry_set_text(entry, text);
- g_free(text);
- }
-
- static void get_entry_tag_v1(GtkEntry * entry, char * tag, int length)
- {
-+ gchar *ctext;
-+
-+ ctext = xmms_rcc_recode(XMMS_RCC_CTYPE, XMMS_RCC_ID3, gtk_entry_get_text(entry));
-+
-+ if (ctext) {
-+ strncpy(tag, ctext, length);
-+ free(ctext);
-+ } else
- strncpy(tag, gtk_entry_get_text(entry), length);
- }
-
- void copy_entry_tag_v1(GtkEntry * src, GtkEntry * dest, int length)
- {
-- set_entry_tag_v1(dest, gtk_entry_get_text(src), length);
-+ char *text = g_strchomp(g_strndup(gtk_entry_get_text(src), length));
-+ gtk_entry_set_text(dest, text);
-+ g_free(text);
- return;
- }
-
-@@ -497,6 +512,7 @@
- int i;
- struct id3v1tag_t id3v1tag;
- FILE *fh;
-+ gchar *cfilename;
- char *tmp, *title;
- const char *emphasis[4];
- const char *bool_label[2];
-@@ -908,6 +924,9 @@
- g_free(current_filename);
- current_filename = g_strdup(filename);
-
-+ cfilename = xmms_rcc_recode(XMMS_RCC_FS, XMMS_RCC_OUT, filename);
-+ if (cfilename) filename=cfilename;
-+
- title = g_strdup_printf(_("File Info - %s"), g_basename(filename));
- gtk_window_set_title(GTK_WINDOW(window), title);
- g_free(title);
-@@ -922,6 +941,8 @@
- gtk_entry_set_text(GTK_ENTRY(v2_title_entry), title);
- g_free(title);
-
-+ if (cfilename) g_free(cfilename);
-+
- gtk_entry_set_text(GTK_ENTRY(v1_artist_entry), "");
- gtk_entry_set_text(GTK_ENTRY(v1_album_entry), "");
- gtk_entry_set_text(GTK_ENTRY(v1_year_entry), "");
-diff -dPNur xmms-1.2.10/Input/mpg123/id3_frame_text.c xmms-1.2.10-new/Input/mpg123/id3_frame_text.c
---- xmms-1.2.10/Input/mpg123/id3_frame_text.c 2005-08-10 03:20:03.000000000 +0200
-+++ xmms-1.2.10-new/Input/mpg123/id3_frame_text.c 2005-08-10 03:29:40.000000000 +0200
-@@ -28,6 +28,7 @@
- #include "id3_header.h"
-
- #include "libxmms/charset.h"
-+#include "libxmms/rcc.h"
-
- /* For extern mpg123_cfg */
- #include "mpg123.h"
-@@ -247,6 +248,9 @@
- */
- int id3_set_text(struct id3_frame *frame, char *text)
- {
-+ char *ctext;
-+ gint8 encoding;
-+
- /* Type check */
- if (frame->fr_desc->fd_idstr[0] != 'T')
- return -1;
-@@ -256,18 +260,36 @@
- */
- id3_frame_clear_data(frame);
-
-+
-+ /*
-+ * Recoding.
-+ */
-+ encoding = (gint8)xmms_rcc_get_id3v2_encoding();
-+ if (encoding == ID3_ENCODING_ISO_8859_1) ctext = xmms_rcc_recode(XMMS_RCC_CTYPE, XMMS_RCC_ID3V2, text);
-+ else if (encoding == ID3_ENCODING_UTF8) ctext = xmms_charset_to_utf8(text);
-+ else if (encoding == ID3_ENCODING_UTF16) ctext = xmms_charset_convert(text, strlen(text), NULL, "UTF-16");
-+ else if (encoding == ID3_ENCODING_UTF16BE) ctext = xmms_charset_convert(text, strlen(text), NULL, "UTF-16BE");
-+ else ctext = NULL;
-+
-+ if (ctext) text = ctext;
-+
- /*
- * Allocate memory for new data.
- */
-+ if ((encoding == ID3_ENCODING_UTF16)||(encoding == ID3_ENCODING_UTF16BE))
-+ frame->fr_raw_size = utf16_strlen(text) + 2;
-+ else
- frame->fr_raw_size = strlen(text) + 1;
- frame->fr_raw_data = g_malloc(frame->fr_raw_size + 1);
-
- /*
- * Copy contents.
- */
-- *(gint8 *) frame->fr_raw_data = ID3_ENCODING_ISO_8859_1;
-+ *(gint8 *) frame->fr_raw_data = encoding;
- memcpy((char *) frame->fr_raw_data + 1, text, frame->fr_raw_size);
-
-+ if (ctext) free(ctext);
-+
- frame->fr_altered = 1;
- frame->fr_owner->id3_altered = 1;
-
-@@ -389,7 +411,10 @@
- */
- int id3_set_comment(struct id3_frame *frame, char *text)
- {
-+ char *ctext, *cdata;
-+ const char *lang;
- int *intp;
-+ gint8 encoding;
-
- /* Type check */
- if (frame->fr_desc->fd_id != ID3_COMM)
-@@ -401,8 +426,23 @@
- id3_frame_clear_data(frame);
-
- /*
-+ * Recoding.
-+ */
-+ encoding = (gint8)xmms_rcc_get_id3v2_encoding();
-+ if (encoding == ID3_ENCODING_ISO_8859_1) ctext = xmms_rcc_recode(XMMS_RCC_CTYPE, XMMS_RCC_ID3V2, text);
-+ else if (encoding == ID3_ENCODING_UTF8) ctext = xmms_charset_to_utf8(text);
-+ else if (encoding == ID3_ENCODING_UTF16) ctext = xmms_charset_convert(text, strlen(text), NULL, "UTF-16");
-+ else if (encoding == ID3_ENCODING_UTF16BE) ctext = xmms_charset_convert(text, strlen(text), NULL, "UTF-16BE");
-+ else ctext = NULL;
-+
-+ if (ctext) text = ctext;
-+
-+ /*
- * Allocate memory for new data.
- */
-+ if ((encoding == ID3_ENCODING_UTF16)||(encoding == ID3_ENCODING_UTF16BE))
-+ frame->fr_raw_size = 25 + utf16_strlen(text);
-+ else
- frame->fr_raw_size = 13 + strlen(text);
- frame->fr_raw_data = g_malloc(frame->fr_raw_size + 1); /* <encode>XXXComments\0<comment><\0>
-
-@@ -410,18 +450,29 @@
- * block, so don't waste time with a calloc()
- */
-
-- ((guint8 *)frame->fr_raw_data)[0] = ID3_ENCODING_ISO_8859_1;
-- ((guint8 *)frame->fr_raw_data)[1] = 0x58;
-- ((guint8 *)frame->fr_raw_data)[2] = 0x58;
-- ((guint8 *)frame->fr_raw_data)[3] = 0x58;
-+ *(gint8 *) frame->fr_raw_data = encoding;
-+ memcpy((char*)frame->fr_raw_data + 1, xmms_rcc_get_language(), 3);
-
-+ if ((encoding == ID3_ENCODING_UTF16)||(encoding == ID3_ENCODING_UTF16BE)) {
-+ int i;
-+ lang = "Comments";
-+ if (encoding == ID3_ENCODING_UTF16) cdata = xmms_charset_convert(lang, strlen(lang), NULL, "UTF-16");
-+ else cdata = xmms_charset_convert(lang, strlen(lang), NULL, "UTF-16BE");
-+ memcpy((char *) frame->fr_raw_data + 4, cdata, 20);
-+ g_free(cdata);
-+ } else
- memcpy((char *) frame->fr_raw_data + 4, "Comments", 9);
-
- /*
- * Copy contents.
- */
-+ if ((encoding == ID3_ENCODING_UTF16)||(encoding == ID3_ENCODING_UTF16BE))
-+ memcpy((char *) frame->fr_raw_data + 24, text, utf16_strlen(text) + 2);
-+ else
- memcpy((char *) frame->fr_raw_data + 13, text, strlen(text) + 1);
-
-+ if (ctext) free(ctext);
-+
- frame->fr_altered = 1;
- frame->fr_owner->id3_altered = 1;
-
diff --git a/patches/xmms/plugins/xmms-ds-mpg123.patch b/patches/xmms/plugins/xmms-ds-mpg123.patch
deleted file mode 100644
index fc9c42e..0000000
--- a/patches/xmms/plugins/xmms-ds-mpg123.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff -dPNur xmms-1.2.11/Input/mpg123/mpg123.c xmms-1.2.11-new/Input/mpg123/mpg123.c
---- xmms-1.2.11/Input/mpg123/mpg123.c 2007-11-25 00:04:27.000000000 +0100
-+++ xmms-1.2.11-new/Input/mpg123/mpg123.c 2007-11-25 01:18:57.000000000 +0100
-@@ -3,6 +3,7 @@
- #include "libxmms/configfile.h"
- #include "libxmms/titlestring.h"
- #include "libxmms/charset.h"
-+#include "libxmms/rcc.h"
- #include <string.h>
- #include <stdlib.h>
- #include <pthread.h>
-@@ -496,6 +497,8 @@
- /*
- * Format according to filename.
- */
-+ ret = xmms_rcc_recode(XMMS_RCC_FS, XMMS_RCC_CTYPE, g_basename(filename));
-+ if (!ret)
- ret = g_strdup(g_basename(filename));
- if (extname(ret) != NULL)
- *(extname(ret) - 1) = '\0'; /* removes period */
diff --git a/patches/xmms/plugins/xmms-ds-vorbis-editor-keys.patch b/patches/xmms/plugins/xmms-ds-vorbis-editor-keys.patch
deleted file mode 100644
index bf59951..0000000
--- a/patches/xmms/plugins/xmms-ds-vorbis-editor-keys.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-diff -dPNur xmms-1.2.11/Input/vorbis/fileinfo.c xmms-1.2.11-new/Input/vorbis/fileinfo.c
---- xmms-1.2.11/Input/vorbis/fileinfo.c 2007-11-25 01:23:31.000000000 +0100
-+++ xmms-1.2.11-new/Input/vorbis/fileinfo.c 2007-11-25 01:24:01.000000000 +0100
-@@ -39,6 +39,9 @@
- #include "libxmms/charset.h"
- #include <xmms/i18n.h>
-
-+#include "../../xmms/xmms.h"
-+#include <gdk/gdkkeysyms.h>
-+
- #include "vorbis.h"
- #include "vcedit.h"
-
-@@ -444,6 +447,28 @@
- }
-
- /***********************************************************************/
-+static int restore_focus;
-+
-+gboolean vorbis_keypress_cb(GtkWidget * w, GdkEventKey * event, gpointer save) {
-+ switch(event->keyval) {
-+ case GDK_Return:
-+ restore_focus=1;
-+ gtk_signal_emit_by_name(GTK_OBJECT(save), "clicked", NULL);
-+ break;
-+ case GDK_Escape:
-+ restore_focus=1;
-+ break;
-+ }
-+ return TRUE;
-+}
-+
-+void gtk_widget_destroyed_focus(GtkWidget *widget, GtkWidget **widget_pointer) {
-+ gtk_widget_destroyed(widget,widget_pointer);
-+ if (restore_focus) {
-+ gtk_widget_hide(playlistwin);
-+ gtk_widget_show(playlistwin);
-+ }
-+}
-
- void vorbis_file_info_box(char *fn)
- {
-@@ -465,6 +490,8 @@
-
- g_free(vte.filename);
- vte.filename = g_strdup(fn);
-+
-+ restore_focus = 0;
-
- if (!window)
- {
-@@ -472,11 +499,12 @@
- GtkWidget *hbox, *label, *filename_hbox, *vbox, *left_vbox;
- GtkWidget *table, *bbox, *cancel_button;
- GtkWidget *save_button, *remove_button;
-+ GtkAccelGroup *ag;
-
- window = gtk_window_new(GTK_WINDOW_DIALOG);
- gtk_window_set_policy(GTK_WINDOW(window), FALSE, FALSE, FALSE);
- gtk_signal_connect(GTK_OBJECT(window), "destroy",
-- GTK_SIGNAL_FUNC(gtk_widget_destroyed), &window);
-+ GTK_SIGNAL_FUNC(gtk_widget_destroyed_focus), &window);
- gtk_signal_connect(GTK_OBJECT(window), "key_press_event",
- keypress_cb, NULL);
- gtk_container_set_border_width(GTK_CONTAINER(window), 10);
-@@ -809,6 +837,12 @@
- FALSE, 0);
-
- gtk_widget_show_all(window);
-+
-+ ag = gtk_accel_group_new();
-+ gtk_accel_group_add(ag, GDK_Escape, 0, 0, GTK_OBJECT(cancel_button), "clicked");
-+ gtk_accel_group_add(ag, GDK_Return, 0, 0, GTK_OBJECT(save_button), "clicked");
-+ gtk_window_add_accel_group(GTK_WINDOW(window), ag);
-+ gtk_signal_connect(GTK_OBJECT(window),"key_press_event",GTK_SIGNAL_FUNC(vorbis_keypress_cb),save_button);
- } else
- gdk_window_raise(window->window);
-
diff --git a/patches/xmms/plugins/xmms-ds-vorbis-editor.patch b/patches/xmms/plugins/xmms-ds-vorbis-editor.patch
deleted file mode 100644
index 47a7ba9..0000000
--- a/patches/xmms/plugins/xmms-ds-vorbis-editor.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-diff -dPNur xmms-1.2.11/Input/vorbis/fileinfo.c xmms-1.2.11-new/Input/vorbis/fileinfo.c
---- xmms-1.2.11/Input/vorbis/fileinfo.c 2007-11-25 00:04:27.000000000 +0100
-+++ xmms-1.2.11-new/Input/vorbis/fileinfo.c 2007-11-25 01:20:57.000000000 +0100
-@@ -34,6 +34,7 @@
- #include <vorbis/codec.h>
- #include <vorbis/vorbisfile.h>
-
-+#include "libxmms/rcc.h"
- #include "libxmms/util.h"
- #include "libxmms/charset.h"
- #include <xmms/i18n.h>
-@@ -451,6 +452,7 @@
- char *description, *version, *isrc, *copyright, *organization;
- char *location, *vendor = "N/A";
- char *rg_track_gain, *rg_album_gain, *rg_track_peak, *rg_album_peak;
-+ gchar *cfilename;
-
- int time, minutes, seconds, bitrate, avgbitrate, rate, channels;
- int filesize, i;
-@@ -931,6 +933,11 @@
- gtk_entry_set_text(GTK_ENTRY(isrc_entry), isrc);
- gtk_entry_set_text(GTK_ENTRY(location_entry), location);
- #endif
-+ cfilename = xmms_rcc_recode(XMMS_RCC_FS, XMMS_RCC_CTYPE, vte.filename);
-+ if (cfilename) {
-+ gtk_entry_set_text(GTK_ENTRY(filename_entry), cfilename);
-+ g_free(cfilename);
-+ } else
- gtk_entry_set_text(GTK_ENTRY(filename_entry), vte.filename);
- gtk_editable_set_position(GTK_EDITABLE(filename_entry), -1);
-
-diff -dPNur xmms-1.2.11/Input/vorbis/vorbis.c xmms-1.2.11-new/Input/vorbis/vorbis.c
---- xmms-1.2.11/Input/vorbis/vorbis.c 2007-11-25 00:04:27.000000000 +0100
-+++ xmms-1.2.11-new/Input/vorbis/vorbis.c 2007-11-25 01:20:57.000000000 +0100
-@@ -46,6 +46,7 @@
- #include "xmms/plugin.h"
- #include "libxmms/util.h"
- #include "libxmms/configfile.h"
-+#include "libxmms/rcc.h"
- #include "libxmms/titlestring.h"
- #include "libxmms/charset.h"
- #include <xmms/i18n.h>
-@@ -754,6 +755,8 @@
- if (!vorbis_is_streaming)
- {
- char *tmp;
-+ displaytitle = xmms_rcc_recode(XMMS_RCC_FS, XMMS_RCC_OUT, g_basename(fn));
-+ if (!displaytitle)
- displaytitle = g_strdup(g_basename(fn));
- if ((tmp = strrchr(displaytitle, '.')) != NULL)
- *tmp = '\0';
diff --git a/patches/xmms/plugins/xmms-wma-csa1.tar.bz2 b/patches/xmms/plugins/xmms-wma-csa1.tar.bz2
new file mode 100644
index 0000000..de6968c
--- /dev/null
+++ b/patches/xmms/plugins/xmms-wma-csa1.tar.bz2
Binary files differ
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-08 19:44:27 +0000