From 8e21d850508db77b923a5b92e1e5139810f07ef8 Mon Sep 17 00:00:00 2001
From: Michael Schwendt <mschwendt@fedoraproject.org>
Date: Mar 19 2010 17:59:31 +0000
Subject: sync missing patches


---

diff --git a/audacious-plugins-2.2-amidi.patch b/audacious-plugins-2.2-amidi.patch
new file mode 100644
index 0000000..ed0a417
--- /dev/null
+++ b/audacious-plugins-2.2-amidi.patch
@@ -0,0 +1,16 @@
+diff -Nur audacious-plugins-2.2-orig/src/amidi-plug/i_midi.c audacious-plugins-2.2-amidi/src/amidi-plug/i_midi.c
+--- audacious-plugins-2.2-orig/src/amidi-plug/i_midi.c	2009-11-22 23:49:52.000000000 +0100
++++ audacious-plugins-2.2-amidi/src/amidi-plug/i_midi.c	2010-03-16 10:41:24.000000000 +0100
+@@ -659,8 +659,10 @@
+   /* IMPORTANT
+      this couple of important values is set by i_midi_set_length */
+   mf->length = length_microsec;
+-  mf->avg_microsec_per_tick = (gint)(length_microsec / mf->max_tick);
+-
++  if (mf->max_tick)
++      mf->avg_microsec_per_tick = (gint)(length_microsec / mf->max_tick);
++  else
++      mf->avg_microsec_per_tick = 1;  /* dummy - protect against div-by-zero */
+   return;
+ }
+ 
diff --git a/audacious-plugins-2.2-no-adplugdb.patch b/audacious-plugins-2.2-no-adplugdb.patch
new file mode 100644
index 0000000..8d71aa4
--- /dev/null
+++ b/audacious-plugins-2.2-no-adplugdb.patch
@@ -0,0 +1,14 @@
+diff -Nur audacious-plugins-2.2-orig/src/adplug/adplug-xmms.cc audacious-plugins-2.2/src/adplug/adplug-xmms.cc
+--- audacious-plugins-2.2-orig/src/adplug/adplug-xmms.cc	2009-11-22 23:49:52.000000000 +0100
++++ audacious-plugins-2.2/src/adplug/adplug-xmms.cc	2010-03-13 19:29:06.000000000 +0100
+@@ -1043,8 +1043,10 @@
+     {
+       std::string userdb;
+       userdb = "file://" + std::string(g_get_home_dir()) + "/" ADPLUG_CONFDIR "/" + ADPLUGDB_FILE;
++      if (aud_vfs_file_test(userdb.c_str(),G_FILE_TEST_EXISTS)) {
+       plr.db->load (userdb);    // load user's database
+       dbg_printf (" (userdb=\"%s\")", userdb.c_str());
++      }
+     }
+   }
+   CAdPlug::set_database (plr.db);
diff --git a/audacious-plugins-2.2-playlist-font-safety.patch b/audacious-plugins-2.2-playlist-font-safety.patch
new file mode 100644
index 0000000..df4adad
--- /dev/null
+++ b/audacious-plugins-2.2-playlist-font-safety.patch
@@ -0,0 +1,12 @@
+diff -Nur audacious-plugins-2.2-orig/src/skins/skins_cfg.c audacious-plugins-2.2/src/skins/skins_cfg.c
+--- audacious-plugins-2.2-orig/src/skins/skins_cfg.c	2009-11-22 23:49:53.000000000 +0100
++++ audacious-plugins-2.2/src/skins/skins_cfg.c	2010-03-13 19:57:52.000000000 +0100
+@@ -233,7 +233,7 @@
+     if (!config.mainwin_font)
+         config.mainwin_font = g_strdup(MAINWIN_DEFAULT_FONT);
+ 
+-    if (!config.playlist_font)
++    if (!config.playlist_font || !strchr(config.playlist_font,' '))
+         config.playlist_font = g_strdup(PLAYLISTWIN_DEFAULT_FONT);
+ 
+     if (!aud_cfg_db_get_float(cfgfile, "skins", "scale_factor", &(config.scale_factor)))