Merge branch 'master' of ssh://git.xmms.se/xmms2/promoe

This commit is contained in:
Tobias Rundstrom 2006-08-19 14:53:34 -04:00
commit b9f8aeadec
13 changed files with 424 additions and 384 deletions

View file

@ -42,7 +42,6 @@ class XMMSHandler : public QObject {
void medialibQueryAdd (QString q) { delete m_xmmsc->medialib_add_to_playlist (q.toUtf8 ()); }
*/
void volumeSet (uint volume);
void volumeGet ();
//const XMMSClient *getXMMS () { return m_xmmsc; }
@ -59,6 +58,7 @@ class XMMSHandler : public QObject {
void pause ();
void next ();
void prev ();
void volumeSet (uint volume);
signals:
void settingsSaved ();