changeset 4411:628926f505f8

BmpConfig -> AudConfig, etc.
author Matti Hamalainen <ccr@tnsp.org>
date Mon, 31 Mar 2008 06:25:09 +0300
parents 82f323bd68fc
children 180996fcf12a
files src/audacious/audconfig.c src/audacious/audconfig.h src/audacious/main.c src/audacious/plugin.h
diffstat 4 files changed, 8 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/src/audacious/audconfig.c	Mon Mar 31 06:23:31 2008 +0300
+++ b/src/audacious/audconfig.c	Mon Mar 31 06:25:09 2008 +0300
@@ -45,7 +45,7 @@
 
 #include "audconfig.h"
 
-BmpConfig bmp_default_config = {
+AudConfig aud_default_config = {
     MAINWIN_DEFAULT_POS_X,      /* mainwin x position */
     MAINWIN_DEFAULT_POS_Y,      /* mainwin y position */
     EQUALIZER_DEFAULT_POS_X,    /* equalizer x position */
@@ -490,7 +490,7 @@
     ConfigDb *db;
     gint i, length;
 
-    memcpy(&cfg, &bmp_default_config, sizeof(BmpConfig));
+    memcpy(&cfg, &aud_default_config, sizeof(AudConfig));
 
     db = cfg_db_open();
     for (i = 0; i < ncfgbent; ++i) {
--- a/src/audacious/audconfig.h	Mon Mar 31 06:23:31 2008 +0300
+++ b/src/audacious/audconfig.h	Mon Mar 31 06:25:09 2008 +0300
@@ -26,7 +26,7 @@
 #ifndef BMPCONFIG_H
 #define BMPCONFIG_H
 
-struct _BmpConfig {
+struct _AudConfig {
     gint player_x, player_y;
     gint equalizer_x, equalizer_y;
     gint playlist_x, playlist_y;
@@ -135,10 +135,10 @@
     gboolean bypass_dsp;
 };
 
-typedef struct _BmpConfig BmpConfig;
+typedef struct _AudConfig AudConfig;
 
-extern BmpConfig cfg;
-extern BmpConfig bmp_default_config;
+extern AudConfig cfg;
+extern AudConfig aud_default_config;
 
 void bmp_config_free(void);
 void bmp_config_load(void);
--- a/src/audacious/main.c	Mon Mar 31 06:23:31 2008 +0300
+++ b/src/audacious/main.c	Mon Mar 31 06:25:09 2008 +0300
@@ -108,7 +108,7 @@
 
 AudCmdLineOpt options;
 
-BmpConfig cfg;
+AudConfig cfg;
 
 const gchar *bmp_titlestring_presets[] = {
     "${title}",
--- a/src/audacious/plugin.h	Mon Mar 31 06:23:31 2008 +0300
+++ b/src/audacious/plugin.h	Mon Mar 31 06:25:09 2008 +0300
@@ -513,7 +513,7 @@
 
     /* state vars */
     InputPluginData *ip_state;
-    BmpConfig *_cfg;
+    AudConfig *_cfg;
 
     /* hook API */
     void (*hook_register)(const gchar *name);