summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKevin Smith <git@kismith.co.uk>2009-06-28 09:41:38 (GMT)
committerKevin Smith <git@kismith.co.uk>2009-06-28 09:41:38 (GMT)
commit1231acac77f2811a94f9bc83e38abb8ed85468b3 (patch)
treec5c6e99544750d13ccc41717f0f6a28694028582 /Swift/Controllers/MainController.h
parente2d9f9e47056a41d5e5a67ea3130ccdd860a06ed (diff)
downloadswift-1231acac77f2811a94f9bc83e38abb8ed85468b3.zip
swift-1231acac77f2811a94f9bc83e38abb8ed85468b3.tar.bz2
Moving resources into Swift/ and starting on Sound.
Diffstat (limited to 'Swift/Controllers/MainController.h')
-rw-r--r--Swift/Controllers/MainController.h5
1 files changed, 4 insertions, 1 deletions
diff --git a/Swift/Controllers/MainController.h b/Swift/Controllers/MainController.h
index 2b7c8b0..1fd7c4c 100644
--- a/Swift/Controllers/MainController.h
+++ b/Swift/Controllers/MainController.h
@@ -40,10 +40,12 @@ namespace Swift {
class PresenceOracle;
class SystemTray;
class SystemTrayController;
+ class SoundEventController;
+ class SoundPlayer;
class MainController : public MUCRegistry {
public:
- MainController(ChatWindowFactory* chatWindowFactory, MainWindowFactory *mainWindowFactory, LoginWindowFactory *loginWindowFactory, TreeWidgetFactory* treeWidgetFactory, SettingsProvider *settings, Application* application, SystemTray* systemTray);
+ MainController(ChatWindowFactory* chatWindowFactory, MainWindowFactory *mainWindowFactory, LoginWindowFactory *loginWindowFactory, TreeWidgetFactory* treeWidgetFactory, SettingsProvider *settings, Application* application, SystemTray* systemTray, SoundPlayer* soundPlayer);
~MainController();
@@ -90,6 +92,7 @@ namespace Swift {
JID jid_;
PresenceOracle* presenceOracle_;
SystemTrayController* systemTrayController_;
+ SoundEventController* soundEventController_;
AvatarManager* avatarManager_;
boost::shared_ptr<Presence> lastSentPresence_;
String vCardPhotoHash_;