Commit 47b761c2 authored by Matthias Kretz's avatar Matthias Kretz

Use libartskde instead of using aRts libs directly. This makes JuK finally

show up in the AudioManager and fixes all the issues I had with the artsd
restarting code of JuK. (no interface changed - only impl)

svn path=/trunk/kdemultimedia/juk/; revision=251497
parent edb6d411
......@@ -38,7 +38,7 @@ mblibs = -lmusicbrainz
endif
##################################################
juk_LDADD = $(gstlibs) $(mblibs) -lid3 -lsoundserver_idl $(LIB_KIO)
juk_LDADD = $(gstlibs) $(mblibs) -lid3 -lartskde $(LIB_KIO)
juk_LDFLAGS = $(all_libraries) $(KDE_RPATH)
tagguessertest_LDADD = $(LIB_KDECORE)
......
This diff is collapsed.
......@@ -2,8 +2,8 @@
artsplayer.h - description
-------------------
begin : Sun Feb 17 2002
copyright : (C) 2002 by Scott Wheeler
email : wheeler@kde.org
copyright : (C) 2002 by Scott Wheeler <wheeler@kde.org>
(C) 2003 by Matthias Kretz <kretz@kde.org>
***************************************************************************/
/***************************************************************************
......@@ -18,16 +18,25 @@
#ifndef ARTSPLAYER_H
#define ARTSPLAYER_H
#include <qstring.h>
#include <soundserver.h>
#include "player.h"
#include <kurl.h>
#include <artsflow.h>
#include "player.h"
class QString;
using namespace Arts;
class KArtsDispatcher;
class KArtsServer;
class KAudioManagerPlay;
namespace KDE {
class PlayObjectFactory;
class PlayObject;
};
class ArtsPlayer : public Player
class ArtsPlayer : public QObject, public Player
{
Q_OBJECT
public:
ArtsPlayer();
virtual ~ArtsPlayer();
......@@ -50,19 +59,29 @@ public:
virtual void seek(long seekTime);
virtual void seekPosition(int position);
private slots:
void setupArtsObjects();
void playObjectCreated();
private:
void setupPlayer();
void setupVolumeControl();
bool serverRunning() const;
void restart();
Dispatcher *m_dispatcher;
SimpleSoundServer *m_server;
PlayObject *m_media;
StereoVolumeControl *m_volumeControl;
KArtsDispatcher *m_dispatcher;
KArtsServer *m_server;
KDE::PlayObjectFactory *m_factory;
KDE::PlayObject *m_playobject;
KAudioManagerPlay *m_amanPlay;
QString m_currentFile;
Arts::StereoVolumeControl m_volumeControl; // this is a pretty heavy module
//for the needs that JuK has, it would probably be good to use two Synth_MUL
//instead or the one from noatun
KURL m_currentURL;
float m_currentVolume;
};
#endif
// vim: sw=4 ts=8 et
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment