Mercurial > audlegacy-plugins

changeset 2497:ed6c81bd9016

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Include cleanups, part #2.
author Matti Hamalainen <ccr@tnsp.org>
date Mon, 31 Mar 2008 14:55:14 +0300
parents 42a5c9d5830b
children 194c2f8c2a92
files src/adplug/adplug-xmms.cc src/alac/plugin.c src/alac/stream.c src/alac/stream.h src/audiocompress/audacious-glue.c src/console/Audacious_Config.cxx src/console/Audacious_Driver.cxx src/console/abstract_file.h src/demac/ape.c src/demac/apedec.c src/demac/apev2.c src/demac/apev2.h src/demac/plugin.c src/madplug/configure.c src/madplug/plugin.c src/madplug/plugin.h src/madplug/replaygain.c src/song_change/song_change.c src/tta/libtta.c
diffstat 19 files changed, 5 insertions(+), 23 deletions(-) [+]
line wrap: on
line diff
--- a/src/adplug/adplug-xmms.cc	Mon Mar 31 14:00:33 2008 +0300
+++ b/src/adplug/adplug-xmms.cc	Mon Mar 31 14:55:14 2008 +0300
@@ -33,7 +33,6 @@
 extern "C"
 {
 #include <audacious/plugin.h>
-#include <audacious/configdb.h>
 #include <audacious/output.h>
 #include <audacious/util.h>
 }
--- a/src/alac/plugin.c	Mon Mar 31 14:00:33 2008 +0300
+++ b/src/alac/plugin.c	Mon Mar 31 14:55:14 2008 +0300
@@ -46,9 +46,7 @@
 #include <audacious/i18n.h>
 
 #include <audacious/plugin.h>
-#include <audacious/main.h>
 #include <audacious/output.h>
-#include <audacious/vfs.h>
 #include <audacious/util.h>
 
 #include "demux.h"
--- a/src/alac/stream.c	Mon Mar 31 14:00:33 2008 +0300
+++ b/src/alac/stream.c	Mon Mar 31 14:55:14 2008 +0300
@@ -45,7 +45,6 @@
 #include <errno.h>
 
 #include <audacious/plugin.h>
-#include <audacious/vfs.h>
 
 #include "stream.h"
 
--- a/src/alac/stream.h	Mon Mar 31 14:00:33 2008 +0300
+++ b/src/alac/stream.h	Mon Mar 31 14:55:14 2008 +0300
@@ -14,7 +14,6 @@
 #endif
 
 #include <audacious/plugin.h>
-#include <audacious/vfs.h>
 
 typedef struct stream_tTAG stream_t;
 
--- a/src/audiocompress/audacious-glue.c	Mon Mar 31 14:00:33 2008 +0300
+++ b/src/audiocompress/audacious-glue.c	Mon Mar 31 14:55:14 2008 +0300
@@ -11,7 +11,6 @@
 #include <audacious/i18n.h>
 #include <audacious/plugin.h>
 #include <audacious/util.h>
-#include <audacious/configdb.h>
 
 #include "audiocompress_config.h"
 #include "compress.h"
--- a/src/console/Audacious_Config.cxx	Mon Mar 31 14:00:33 2008 +0300
+++ b/src/console/Audacious_Config.cxx	Mon Mar 31 14:55:14 2008 +0300
@@ -14,7 +14,6 @@
 #include <audacious/i18n.h>
 #include <audacious/plugin.h>
 #include <gtk/gtk.h>
-#include <audacious/configdb.h>
 #include "Audacious_Config.h"
 
 // TODO: add UI for echo
--- a/src/console/Audacious_Driver.cxx	Mon Mar 31 14:00:33 2008 +0300
+++ b/src/console/Audacious_Driver.cxx	Mon Mar 31 14:55:14 2008 +0300
@@ -15,7 +15,6 @@
 #include <audacious/plugin.h>
 #include <audacious/util.h>
 #include <audacious/output.h>
-#include <audacious/playlist.h>
 }
 #include <string.h>
 #include <stdlib.h>
--- a/src/console/abstract_file.h	Mon Mar 31 14:00:33 2008 +0300
+++ b/src/console/abstract_file.h	Mon Mar 31 14:55:14 2008 +0300
@@ -5,7 +5,6 @@
 #define ABSTRACT_FILE_H
 
 #include <stdio.h>
-#include <audacious/vfs.h>
 
 // Supports reading and finding out how many bytes are remaining
 class Data_Reader {
--- a/src/demac/ape.c	Mon Mar 31 14:00:33 2008 +0300
+++ b/src/demac/ape.c	Mon Mar 31 14:55:14 2008 +0300
@@ -27,7 +27,6 @@
 #include <errno.h> 
 #include <string.h> 
 
-#include <audacious/vfs.h>
 #include <audacious/plugin.h> 
 
 #include "ape.h"
--- a/src/demac/apedec.c	Mon Mar 31 14:00:33 2008 +0300
+++ b/src/demac/apedec.c	Mon Mar 31 14:55:14 2008 +0300
@@ -28,7 +28,6 @@
 #include <string.h> 
 #include <assert.h> 
 
-#include <audacious/vfs.h>
 #include <audacious/plugin.h> 
 
 #include "ape.h"
--- a/src/demac/apev2.c	Mon Mar 31 14:00:33 2008 +0300
+++ b/src/demac/apev2.c	Mon Mar 31 14:55:14 2008 +0300
@@ -26,7 +26,6 @@
 
 #include <glib.h>
 #include <mowgli.h>
-#include <audacious/vfs.h>
 #include <audacious/plugin.h> 
 
 #include "ape.h"
--- a/src/demac/apev2.h	Mon Mar 31 14:00:33 2008 +0300
+++ b/src/demac/apev2.h	Mon Mar 31 14:55:14 2008 +0300
@@ -2,7 +2,6 @@
 #define APEV2_H
 
 #include <mowgli.h>
-#include <audacious/vfs.h>
 
 mowgli_dictionary_t* parse_apev2_tag(VFSFile *vfd);
 gboolean write_apev2_tag(VFSFile *vfd, mowgli_dictionary_t *tag);
--- a/src/demac/plugin.c	Mon Mar 31 14:00:33 2008 +0300
+++ b/src/demac/plugin.c	Mon Mar 31 14:55:14 2008 +0300
@@ -44,9 +44,7 @@
 #include <audacious/i18n.h> 
 
 #include <audacious/plugin.h> 
-#include <audacious/main.h> 
 #include <audacious/output.h> 
-#include <audacious/vfs.h> 
 #include <audacious/util.h> 
 
 #include "ape.h"
--- a/src/madplug/configure.c	Mon Mar 31 14:00:33 2008 +0300
+++ b/src/madplug/configure.c	Mon Mar 31 14:55:14 2008 +0300
@@ -25,7 +25,6 @@
 
 #include <gtk/gtk.h>
 #include <math.h>
-#include <audacious/configdb.h>
 
 static GtkWidget *configure_win = NULL;
 static audmad_config_t *oldconfig = NULL; // undo storage
--- a/src/madplug/plugin.c	Mon Mar 31 14:00:33 2008 +0300
+++ b/src/madplug/plugin.c	Mon Mar 31 14:55:14 2008 +0300
@@ -29,10 +29,8 @@
 
 #include <gtk/gtk.h>
 #include <audacious/util.h>
-#include <audacious/configdb.h>
 #include <stdarg.h>
 #include <fcntl.h>
-#include <audacious/vfs.h>
 #include <sys/stat.h>
 #include "tuple.h"
 
--- a/src/madplug/plugin.h	Mon Mar 31 14:00:33 2008 +0300
+++ b/src/madplug/plugin.h	Mon Mar 31 14:55:14 2008 +0300
@@ -37,7 +37,6 @@
 #include <string.h>
 #include <unistd.h>
 #include <audacious/plugin.h>
-#include <audacious/main.h>
 #include <audacious/util.h>
 #include <audacious/strings.h>
 #include <audacious/i18n.h>
--- a/src/madplug/replaygain.c	Mon Mar 31 14:00:33 2008 +0300
+++ b/src/madplug/replaygain.c	Mon Mar 31 14:55:14 2008 +0300
@@ -65,6 +65,9 @@
     return res;
 }
 
+/* Check for APE tag header in current file position, and read
+ * header data into given structure. Return 0 if OK.
+ */
 static gint checkAPEHeader(VFSFile * fp, ape_header_t *hdr)
 {
     /* Get magic id and check it */
@@ -90,7 +93,8 @@
     return 0;
 }
 
-// Reads APE v2.0 tag ending at current pos in fp
+/* Reads APE v2.0 tag ending at current pos in fp
+ */
 static gint
 readAPE2Tag(VFSFile * fp, struct mad_info_t *file_info)
 {
--- a/src/song_change/song_change.c	Mon Mar 31 14:00:33 2008 +0300
+++ b/src/song_change/song_change.c	Mon Mar 31 14:55:14 2008 +0300
@@ -17,12 +17,10 @@
 
 #include <audacious/plugin.h>
 #include <audacious/ui_preferences.h>
-#include <audacious/configdb.h>
 #include <audacious/auddrct.h>
 #include "formatter.h"
 #include <audacious/i18n.h>
 #include <audacious/hook.h>
-#include <audacious/playlist.h>
 
 static void init(void);
 static void cleanup(void);
--- a/src/tta/libtta.c	Mon Mar 31 14:00:33 2008 +0300
+++ b/src/tta/libtta.c	Mon Mar 31 14:55:14 2008 +0300
@@ -43,7 +43,6 @@
 
 #include <audacious/plugin.h>
 #include <audacious/util.h>
-#include <audacious/main.h>
 #include <audacious/output.h>
 #include <audacious/strings.h>
 #include <audacious/i18n.h>