Swiftdiff options
| author | Kevin Smith <git@kismith.co.uk> | 2009-08-09 07:41:27 (GMT) |
|---|---|---|
| committer | Kevin Smith <git@kismith.co.uk> | 2009-08-09 07:41:27 (GMT) |
| commit | 89034baf34d913daae0d53d0468885c603762d8a (patch) | |
| tree | 8a94b6119eae3e1f6970ee53f57118fcbd116af5 /Swift/QtUI/QtSoundPlayer.cpp | |
| parent | 6f4fa16b1ddb0633771423a8e8d9520864ffb95d (diff) | |
| parent | f948f047401021f3afc8a015991fc81e7d69d6ce (diff) | |
| download | swift-contrib-89034baf34d913daae0d53d0468885c603762d8a.zip swift-contrib-89034baf34d913daae0d53d0468885c603762d8a.tar.bz2 | |
Replace dummy roster with Qt Model/View driven one.
Merge branch 'roster'
* roster:
Group expandedness in roster persists between roster changes.
Plumbing in place for roster group expansion. \nDoesn't work.
Conditional includes to get the QtSoundPlayer to compile on Ubuntu.
Roster clicks now open chats again.
Roster now includes avatars.
Resize avatars to 32pix in Roster, change alignments to be relative, do item hiding.
Sort out the alignments in the roster.
Render status text italicised, and selection colours.
Now render an ugly default icon and default status text in the roster.
Use a (boring) delegate for roster rendering.
Clear down some of the cruft from RosterItem.
Removing RosterItem and including in QtTreeWidgetItem.
Removing the dummy title from the roster.
The new roster now renders (badly) the contents.
Begin to assage Swift model into Qt Model/View.
Diffstat (limited to 'Swift/QtUI/QtSoundPlayer.cpp')
| -rw-r--r-- | Swift/QtUI/QtSoundPlayer.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/Swift/QtUI/QtSoundPlayer.cpp b/Swift/QtUI/QtSoundPlayer.cpp index 5dd3db3..4aa6b8e 100644 --- a/Swift/QtUI/QtSoundPlayer.cpp +++ b/Swift/QtUI/QtSoundPlayer.cpp @@ -1,8 +1,12 @@ #include "QtSoundPlayer.h" +#ifdef Q_WS_X11 +#include "mediaobject.h" +#include "audiooutput.h" +#else #include <phonon/MediaObject> #include <phonon/AudioOutput> - +#endif namespace Swift{ @@ -33,4 +37,4 @@ void QtSoundPlayer::handleFinished() { messageReceived_->stop(); } -}
\ No newline at end of file +} |