changeset 520:8f1785471613 trunk

[svn] - add missing inclusion of audacious/strings.h where necessary
author giacomo
date Mon, 22 Jan 2007 10:36:50 -0800
parents bbc597d9875d
children 72515e5313cf
files ChangeLog src/amidi-plug/amidi-plug.c src/cue/cuesheet.c src/flac112/plugin.c src/flac113/fileinfo.c src/mpg123/fileinfo.c src/mpg123/mpg123.c src/tta/aud-tta.c src/wma/wma.c
diffstat 9 files changed, 31 insertions(+), 19 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Mon Jan 22 10:32:03 2007 -0800
+++ b/ChangeLog	Mon Jan 22 10:36:50 2007 -0800
@@ -1,3 +1,10 @@
+2007-01-22 18:32:03 +0000  Giacomo Lozito <james@develia.org>
+  revision [1124]
+  - re-add code that was accidentally removed after merge of getc/ungetc implementation
+  trunk/src/curl/curl.c |   92 +++++++++++++++++++++++++++++++++++++++-----------
+  1 file changed, 73 insertions(+), 19 deletions(-)
+
+
 2007-01-22 17:47:19 +0000  William Pitcock <nenolod@sacredspiral.co.uk>
   revision [1122]
   - add some presets i had sitting around
--- a/src/amidi-plug/amidi-plug.c	Mon Jan 22 10:32:03 2007 -0800
+++ b/src/amidi-plug/amidi-plug.c	Mon Jan 22 10:36:50 2007 -0800
@@ -28,7 +28,7 @@
 }
 
 
-static gboolean amidiplug_detect_by_content( VFSFile * fp )
+static gboolean amidiplug_detect_by_content( gchar * filename , VFSFile * fp )
 {
   gchar magic_bytes[4];
   gint res = 0;
@@ -76,7 +76,7 @@
   if ( fp == NULL )
     return FALSE;
 
-  result = amidiplug_detect_by_content( fp );
+  result = amidiplug_detect_by_content( filename , fp );
   VFS_FCLOSE( fp );
 
   return result;
@@ -85,7 +85,7 @@
 
 static gint amidiplug_is_our_file_from_vfs( gchar *filename , VFSFile *fp )
 {
-  return amidiplug_detect_by_content( fp );
+  return amidiplug_detect_by_content( filename , fp );
 }
 
 
--- a/src/cue/cuesheet.c	Mon Jan 22 10:32:03 2007 -0800
+++ b/src/cue/cuesheet.c	Mon Jan 22 10:36:50 2007 -0800
@@ -25,6 +25,7 @@
 #include <audacious/vfs.h>
 #include <audacious/util.h>
 #include <audacious/main.h>
+#include <audacious/strings.h>
 
 #define MAX_CUE_LINE_LENGTH 1000
 #define MAX_CUE_TRACKS 1000
--- a/src/flac112/plugin.c	Mon Jan 22 10:32:03 2007 -0800
+++ b/src/flac112/plugin.c	Mon Jan 22 10:36:50 2007 -0800
@@ -245,6 +245,7 @@
 	bmp_cfg_db_close(db);
 
 	decoder_ = FLAC__seekable_stream_decoder_new();
+	file_info_.vfsfile = NULL;
 }
 
 int FLAC_XMMS__is_our_file_from_vfs( gchar * filename , VFSFile * vfsfile )
--- a/src/flac113/fileinfo.c	Mon Jan 22 10:32:03 2007 -0800
+++ b/src/flac113/fileinfo.c	Mon Jan 22 10:36:50 2007 -0800
@@ -26,7 +26,8 @@
 #include <stdarg.h>
 #include <gtk/gtk.h>
 
-#include "audacious/util.h"
+#include <audacious/util.h>
+#include <audacious/strings.h>
 #include "FLAC/metadata.h"
 #include "charset.h"
 #include "configure.h"
--- a/src/mpg123/fileinfo.c	Mon Jan 22 10:32:03 2007 -0800
+++ b/src/mpg123/fileinfo.c	Mon Jan 22 10:36:50 2007 -0800
@@ -37,8 +37,9 @@
 #include <fcntl.h>
 #include <errno.h>
 
-#include "audacious/util.h"
-#include "audacious/vfs.h"
+#include <audacious/util.h>
+#include <audacious/vfs.h>
+#include <audacious/strings.h>
 
 #include "mp3.xpm"
 
--- a/src/mpg123/mpg123.c	Mon Jan 22 10:32:03 2007 -0800
+++ b/src/mpg123/mpg123.c	Mon Jan 22 10:36:50 2007 -0800
@@ -18,11 +18,12 @@
 #include <arpa/inet.h>
 #include <netdb.h>
 
-#include "audacious/util.h"
-#include "audacious/configdb.h"
-#include "audacious/vfs.h"
-#include "audacious/titlestring.h"
-#include "audacious/util.h"
+#include <audacious/util.h>
+#include <audacious/configdb.h>
+#include <audacious/vfs.h>
+#include <audacious/titlestring.h>
+#include <audacious/util.h>
+#include <audacious/strings.h>
 #include <tag_c.h>
 
 #define BUFSIZE_X	2048
--- a/src/tta/aud-tta.c	Mon Jan 22 10:32:03 2007 -0800
+++ b/src/tta/aud-tta.c	Mon Jan 22 10:36:50 2007 -0800
@@ -44,8 +44,8 @@
 #include <audacious/titlestring.h>
 #include <audacious/vfs.h>
 #include "aud-support.h"
-#include "audacious/output.h"
-#include "audacious/util.h"
+#include <audacious/output.h>
+#include <audacious/strings.h>
 
 #include <id3tag.h>
 
--- a/src/wma/wma.c	Mon Jan 22 10:32:03 2007 -0800
+++ b/src/wma/wma.c	Mon Jan 22 10:36:50 2007 -0800
@@ -33,12 +33,12 @@
 #include <glib.h>
 #include <glib/gi18n.h>
 
-#include "audacious/plugin.h"
-#include "audacious/output.h"
-#include "audacious/util.h"
-#include "audacious/titlestring.h"
-#include "audacious/vfs.h"
-#include "audacious/util.h"
+#include <audacious/plugin.h>
+#include <audacious/output.h>
+#include <audacious/util.h>
+#include <audacious/titlestring.h>
+#include <audacious/vfs.h>
+#include <audacious/strings.h>
 
 #include "avcodec.h"
 #include "avformat.h"