fix conflict

1 files changed, 4 insertions, 0 deletions

diff --git a/src/audtool/audtool.h b/src/audtool/audtool.h
index cb62488..c0bb88d 100644
--- a/src/audtool/audtool.h
+++ b/src/audtool/audtool.h
@@ -114,6 +114,8 @@ void playback_stopped (int, char * *);
 void playback_status (int, char * *);
 void playback_seek (int, char * *);
 void playback_seek_relative (int, char * *);
+void playback_record (int, char * *);
+void playback_recording (int, char * *);
 
 void mainwin_show (int, char * *);
 void show_preferences_window (int, char * *);
@@ -123,6 +125,8 @@ void shutdown_audacious_server (int, char * *);
 void show_about_window (int, char * *);
 
 void get_version (int argc, char * * argv);
+void plugin_is_enabled (int argc, char * * argv);
+void plugin_enable (int argc, char * * argv);
 
 void equalizer_get_eq (int argc, char * * argv);
 void equalizer_get_eq_preamp (int argc, char * * argv);