Menu
▾
▴
[aqualung-friends] [PATCH 08/15] C: clean up externs
|
From: Jamie H. <ja...@au...> - 2012-01-29 08:23:11
|
Remove a bunch of unused externs and make sure functions that end up
compiled by the C++ compiler have C linkage.
---
src/cdda.c | 4 ----
src/cddb_lookup.c | 1 -
src/cover.c | 1 -
src/decoder/dec_mac.cpp | 3 +--
src/decoder/dec_mac.h | 5 +++--
src/decoder/file_decoder.c | 1 -
src/encoder/file_encoder.c | 2 --
src/file_info.c | 2 --
src/gui_main.c | 2 --
src/ifp_device.c | 1 -
src/metadata.h | 4 ++++
src/metadata_ape.h | 4 ++++
src/music_browser.c | 4 ----
src/options.c | 3 ---
src/playlist.c | 10 ----------
src/plugin.c | 1 -
src/store_cdda.c | 4 ----
17 files changed, 12 insertions(+), 40 deletions(-)
diff --git a/src/cdda.c b/src/cdda.c
index dab90c5..eaaf083 100644
--- a/src/cdda.c
+++ b/src/cdda.c
@@ -54,14 +54,10 @@
extern options_t options;
-extern GdkPixbuf * icon_store;
-extern GdkPixbuf * icon_record;
extern GdkPixbuf * icon_track;
-extern GdkPixbuf * icon_cdda;
extern GdkPixbuf * icon_cdda_disc;
extern GdkPixbuf * icon_cdda_nodisc;
extern GtkTreeStore * music_store;
-extern GtkWidget * browser_window;
typedef struct {
diff --git a/src/cddb_lookup.c b/src/cddb_lookup.c
index 2381ce9..82f63f7 100644
--- a/src/cddb_lookup.c
+++ b/src/cddb_lookup.c
@@ -48,7 +48,6 @@ extern options_t options;
extern GtkWidget * browser_window;
extern GtkTreeStore * music_store;
-extern GtkTreeSelection * music_select;
enum {
diff --git a/src/cover.c b/src/cover.c
index dad8fef..3e270a7 100644
--- a/src/cover.c
+++ b/src/cover.c
@@ -42,7 +42,6 @@ extern options_t options;
extern gint cover_show_flag;
-extern GtkWidget * main_window;
extern GtkTreeStore * music_store;
/* maximum 4 chars per extension */
diff --git a/src/decoder/dec_mac.cpp b/src/decoder/dec_mac.cpp
index 1328dbb..21a0d0f 100644
--- a/src/decoder/dec_mac.cpp
+++ b/src/decoder/dec_mac.cpp
@@ -53,14 +53,13 @@
#undef PACKAGE_VERSION
#undef VERSION
-extern "C" {
#include "../i18n.h"
#include "../metadata.h"
#include "../metadata_ape.h"
#include "../rb.h"
#include "file_decoder.h"
#include "dec_mac.h"
-}
+
extern size_t sample_size;
diff --git a/src/decoder/dec_mac.h b/src/decoder/dec_mac.h
index 8b8ac1e..0634b44 100644
--- a/src/decoder/dec_mac.h
+++ b/src/decoder/dec_mac.h
@@ -47,7 +47,7 @@ typedef struct _mac_pdata_t {
#ifdef __cplusplus
-extern "C"{
+extern "C" {
#endif
decoder_t * mac_decoder_init(file_decoder_t * fdec);
@@ -59,9 +59,10 @@ unsigned int mac_decoder_read(decoder_t * dec, float * dest, int num);
void mac_decoder_seek(decoder_t * dec, unsigned long long seek_to_pos);
#ifdef __cplusplus
-}
+} /* extern "C" */
#endif
+
#endif /* AQUALUNG_DEC_MAC_H */
// vim: shiftwidth=8:tabstop=8:softtabstop=8 :
diff --git a/src/decoder/file_decoder.c b/src/decoder/file_decoder.c
index 3be9fa7..bccdc06 100644
--- a/src/decoder/file_decoder.c
+++ b/src/decoder/file_decoder.c
@@ -70,7 +70,6 @@
#include "file_decoder.h"
-extern size_t sample_size;
extern options_t options;
typedef decoder_t * decoder_init_t(file_decoder_t * fdec);
diff --git a/src/encoder/file_encoder.c b/src/encoder/file_encoder.c
index 0628bc4..72cd211 100644
--- a/src/encoder/file_encoder.c
+++ b/src/encoder/file_encoder.c
@@ -30,8 +30,6 @@
#include "enc_sndfile.h"
#include "file_encoder.h"
-extern size_t sample_size;
-
typedef encoder_t * encoder_init_t(file_encoder_t * fenc);
diff --git a/src/file_info.c b/src/file_info.c
index 2af6404..22a44ce 100644
--- a/src/file_info.c
+++ b/src/file_info.c
@@ -81,7 +81,6 @@ enum {
extern options_t options;
-extern GtkWidget* gui_stock_label_button(gchar *label, const gchar *stock);
#define FI_MAXPAGES 256
@@ -156,7 +155,6 @@ typedef struct {
extern GtkWidget * main_window;
extern GtkTreeStore * music_store;
-extern GtkTreeSelection * music_select;
extern GtkWidget * music_tree;
diff --git a/src/gui_main.c b/src/gui_main.c
index b299979..15d3bb9 100644
--- a/src/gui_main.c
+++ b/src/gui_main.c
@@ -119,7 +119,6 @@ extern char * jack_shutdown_reason;
extern int aqualung_socket_fd;
extern int aqualung_session_id;
-extern GtkTreeStore * music_store;
extern GtkListStore * running_store;
extern GtkWidget * plist_menu;
@@ -330,7 +329,6 @@ extern char fileinfo_name[MAXLEN];
extern char fileinfo_file[MAXLEN];
extern GtkWidget * plist__fileinfo;
-extern GtkWidget * plist__rva;
extern gint playlist_state;
extern gint browser_state;
diff --git a/src/ifp_device.c b/src/ifp_device.c
index ba9ba9e..392344b 100644
--- a/src/ifp_device.c
+++ b/src/ifp_device.c
@@ -47,7 +47,6 @@
extern options_t options;
extern GtkWidget * playlist_window;
extern GtkWidget * main_window;
-extern GtkTooltips * aqualung_tooltips;
void aifp_close_device(void);
gint aifp_directory_listing(gchar *name);
diff --git a/src/metadata.h b/src/metadata.h
index 88f8061..bb0bd79 100644
--- a/src/metadata.h
+++ b/src/metadata.h
@@ -29,6 +29,8 @@
#include "common.h"
+G_BEGIN_DECLS
+
/* tag (and pseudo-tag) types */
#define META_TAG_NULL 0x000
#define META_TAG_ID3v1 0x001
@@ -260,5 +262,7 @@ void metadata_dump(metadata_t * meta);
void meta_dump_frame(meta_frame_t * frame);
*/
+G_END_DECLS
+
#endif /* AQUALUNG_METADATA_H */
diff --git a/src/metadata_ape.h b/src/metadata_ape.h
index 038c5eb..761af72 100644
--- a/src/metadata_ape.h
+++ b/src/metadata_ape.h
@@ -27,6 +27,8 @@
#include "metadata.h"
+G_BEGIN_DECLS
+
#define APE_FLAG_READONLY 1
#define APE_FLAG_TEXT 0x00
#define APE_FLAG_BINARY 0x02
@@ -77,5 +79,7 @@ int meta_ape_replace_or_append(char * filename, ape_tag_t * tag);
int meta_ape_write_metadata(file_decoder_t * fdec, metadata_t * meta);
void meta_ape_send_metadata(metadata_t * meta, file_decoder_t * fdec);
+G_END_DECLS
+
#endif /* AQUALUNG_METADATA_APE_H */
diff --git a/src/music_browser.c b/src/music_browser.c
index be2b6e1..f7879ae 100644
--- a/src/music_browser.c
+++ b/src/music_browser.c
@@ -60,10 +60,6 @@ extern GtkListStore * ms_pathlist_store;
extern PangoFontDescription *fd_browser;
extern PangoFontDescription *fd_statusbar;
-extern char pl_color_inactive[14];
-
-extern GtkTooltips * aqualung_tooltips;
-
GtkWidget * browser_window;
int music_store_changed = 0;
diff --git a/src/options.c b/src/options.c
index 3491199..8f0e491 100644
--- a/src/options.c
+++ b/src/options.c
@@ -77,7 +77,6 @@ extern int src_type_parsed;
extern GtkWidget * main_window;
extern GtkWidget * playlist_window;
extern GtkWidget * playlist_color_indicator;
-extern GtkTooltips * aqualung_tooltips;
extern PangoFontDescription *fd_playlist;
extern PangoFontDescription *fd_browser;
@@ -87,8 +86,6 @@ extern PangoFontDescription *fd_songtitle;
extern PangoFontDescription *fd_songinfo;
extern PangoFontDescription *fd_statusbar;
-extern int music_store_changed;
-
extern GtkWidget * music_tree;
extern GtkTreeStore * music_store;
diff --git a/src/playlist.c b/src/playlist.c
index fe7f870..fa991d6 100644
--- a/src/playlist.c
+++ b/src/playlist.c
@@ -68,27 +68,17 @@ extern options_t options;
extern char pl_color_active[14];
extern char pl_color_inactive[14];
-extern GtkTooltips * aqualung_tooltips;
-
extern PangoFontDescription *fd_playlist;
extern PangoFontDescription *fd_statusbar;
extern GtkWidget * main_window;
-extern GtkWidget * info_window;
extern GtkTreeSelection * music_select;
-extern gulong play_id;
-extern gulong pause_id;
-extern GtkWidget * play_button;
-extern GtkWidget * pause_button;
-
extern int is_file_loaded;
extern int is_paused;
extern int allow_seeks;
-extern char current_file[MAXLEN];
-
extern rb_t * rb_gui2disk;
extern GtkWidget * playlist_toggle;
diff --git a/src/plugin.c b/src/plugin.c
index 66ddb9a..a31b5a5 100644
--- a/src/plugin.c
+++ b/src/plugin.c
@@ -51,7 +51,6 @@ extern volatile int plugin_lock;
extern int n_plugins;
extern plugin_instance * plugin_vect[MAX_PLUGINS];
-extern unsigned long ladspa_buflen;
extern LADSPA_Data * l_buf;
extern LADSPA_Data * r_buf;
diff --git a/src/store_cdda.c b/src/store_cdda.c
index 2966518..0ff28c4 100644
--- a/src/store_cdda.c
+++ b/src/store_cdda.c
@@ -68,10 +68,6 @@ extern char pl_color_inactive[14];
extern options_t options;
-extern GdkPixbuf * icon_store;
-extern GdkPixbuf * icon_record;
-extern GdkPixbuf * icon_track;
-
extern GtkTreeStore * music_store;
extern GtkWidget * browser_window;
extern GList * playlists;
--
1.7.8.3
|