summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--noncore/multimedia/opieplayer2/threadutil.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/noncore/multimedia/opieplayer2/threadutil.h b/noncore/multimedia/opieplayer2/threadutil.h
index 1411535..2e83d3a 100644
--- a/noncore/multimedia/opieplayer2/threadutil.h
+++ b/noncore/multimedia/opieplayer2/threadutil.h
@@ -121,65 +121,64 @@ namespace ThreadUtil
void wakeUp();
private:
int m_readFd;
int m_writeFd;
QSocketNotifier *m_notifier;
};
class Channel;
class ChannelMessage
{
friend class Channel;
public:
ChannelMessage( int type = -1 );
virtual ~ChannelMessage();
int type() const { return m_type; }
void reply();
private:
ChannelMessage( const ChannelMessage & );
ChannelMessage &operator=( const ChannelMessage );
int m_type;
bool m_isCall : 1;
bool m_replied : 1;
bool m_inEventHandler : 1;
Mutex m_guard;
WaitCondition m_condition;
- QGuardedPtr<Channel> m_channel;
};
class Channel : public QObject
{
Q_OBJECT
public:
enum SendType { OneWay, WaitForReply };
Channel( QObject *parent = 0, const char *name = 0 );
virtual ~Channel();
void send( ChannelMessage *message, SendType type );
protected:
virtual void receiveMessage( ChannelMessage *message, SendType type ) = 0;
private slots:
void deliver();
private:
OnewayNotifier m_notifier;
struct MsgEnvelope
{
MsgEnvelope() : type( OneWay ), msg( 0 ) {}
MsgEnvelope( SendType _type , ChannelMessage *_msg )
: type( _type ), msg( _msg ) {}
SendType type;
ChannelMessage *msg;
};
void deliverOne( const MsgEnvelope &envelope );