From a955243adb1f484c1c4dc233d16a0afb07fe7b1e Mon Sep 17 00:00:00 2001
From: Lars-Dominik Braun <PromyLOPh@lavabit.com>
Date: Sat, 31 Jul 2010 13:00:36 +0200
Subject: Replaced long argument list of ui callback functions

Structure BarApp_t contains most important data now.
---
 src/ui_act.h | 50 ++++++++++++++++++++++++++------------------------
 1 file changed, 26 insertions(+), 24 deletions(-)

(limited to 'src/ui_act.h')

diff --git a/src/ui_act.h b/src/ui_act.h
index 2da5883..f731f72 100644
--- a/src/ui_act.h
+++ b/src/ui_act.h
@@ -24,29 +24,31 @@ THE SOFTWARE.
 #ifndef _UI_ACT_H
 #define _UI_ACT_H
 
-#include "settings.h"
-
-void BarUiActHelp (BAR_KS_ARGS);
-void BarUiActAddMusic (BAR_KS_ARGS);
-void BarUiActBanSong (BAR_KS_ARGS);
-void BarUiActCreateStation (BAR_KS_ARGS);
-void BarUiActAddSharedStation (BAR_KS_ARGS);
-void BarUiActDeleteStation (BAR_KS_ARGS);
-void BarUiActExplain (BAR_KS_ARGS);
-void BarUiActStationFromGenre (BAR_KS_ARGS);
-void BarUiActSongInfo (BAR_KS_ARGS);
-void BarUiActLoveSong (BAR_KS_ARGS);
-void BarUiActSkipSong (BAR_KS_ARGS);
-void BarUiActMoveSong (BAR_KS_ARGS);
-void BarUiActPause (BAR_KS_ARGS);
-void BarUiActRenameStation (BAR_KS_ARGS);
-void BarUiActSelectStation (BAR_KS_ARGS);
-void BarUiActTempBanSong (BAR_KS_ARGS);
-void BarUiActPrintUpcoming (BAR_KS_ARGS);
-void BarUiActSelectQuickMix (BAR_KS_ARGS);
-void BarUiActQuit (BAR_KS_ARGS);
-void BarUiActDebug (BAR_KS_ARGS);
-void BarUiActHistory (BAR_KS_ARGS);
-void BarUiActBookmark (BAR_KS_ARGS);
+#include "main.h"
+
+#define BarUiActCallback(name) void name (BarApp_t *app, FILE *curFd)
+
+BarUiActCallback(BarUiActHelp);
+BarUiActCallback(BarUiActAddMusic);
+BarUiActCallback(BarUiActBanSong);
+BarUiActCallback(BarUiActCreateStation);
+BarUiActCallback(BarUiActAddSharedStation);
+BarUiActCallback(BarUiActDeleteStation);
+BarUiActCallback(BarUiActExplain);
+BarUiActCallback(BarUiActStationFromGenre);
+BarUiActCallback(BarUiActSongInfo);
+BarUiActCallback(BarUiActLoveSong);
+BarUiActCallback(BarUiActSkipSong);
+BarUiActCallback(BarUiActMoveSong);
+BarUiActCallback(BarUiActPause);
+BarUiActCallback(BarUiActRenameStation);
+BarUiActCallback(BarUiActSelectStation);
+BarUiActCallback(BarUiActTempBanSong);
+BarUiActCallback(BarUiActPrintUpcoming);
+BarUiActCallback(BarUiActSelectQuickMix);
+BarUiActCallback(BarUiActQuit);
+BarUiActCallback(BarUiActDebug);
+BarUiActCallback(BarUiActHistory);
+BarUiActCallback(BarUiActBookmark);
 
 #endif /* _UI_ACT_H */
-- 
cgit v1.2.3