-rw-r--r-- | noncore/multimedia/opieplayer2/threadutil.h | 1 |
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 | |||
@@ -137,33 +137,32 @@ namespace ThreadUtil | |||
137 | virtual ~ChannelMessage(); | 137 | virtual ~ChannelMessage(); |
138 | 138 | ||
139 | int type() const { return m_type; } | 139 | int type() const { return m_type; } |
140 | 140 | ||
141 | void reply(); | 141 | void reply(); |
142 | 142 | ||
143 | private: | 143 | private: |
144 | ChannelMessage( const ChannelMessage & ); | 144 | ChannelMessage( const ChannelMessage & ); |
145 | ChannelMessage &operator=( const ChannelMessage ); | 145 | ChannelMessage &operator=( const ChannelMessage ); |
146 | 146 | ||
147 | int m_type; | 147 | int m_type; |
148 | bool m_isCall : 1; | 148 | bool m_isCall : 1; |
149 | bool m_replied : 1; | 149 | bool m_replied : 1; |
150 | bool m_inEventHandler : 1; | 150 | bool m_inEventHandler : 1; |
151 | Mutex m_guard; | 151 | Mutex m_guard; |
152 | WaitCondition m_condition; | 152 | WaitCondition m_condition; |
153 | QGuardedPtr<Channel> m_channel; | ||
154 | }; | 153 | }; |
155 | 154 | ||
156 | class Channel : public QObject | 155 | class Channel : public QObject |
157 | { | 156 | { |
158 | Q_OBJECT | 157 | Q_OBJECT |
159 | public: | 158 | public: |
160 | enum SendType { OneWay, WaitForReply }; | 159 | enum SendType { OneWay, WaitForReply }; |
161 | Channel( QObject *parent = 0, const char *name = 0 ); | 160 | Channel( QObject *parent = 0, const char *name = 0 ); |
162 | virtual ~Channel(); | 161 | virtual ~Channel(); |
163 | 162 | ||
164 | void send( ChannelMessage *message, SendType type ); | 163 | void send( ChannelMessage *message, SendType type ); |
165 | 164 | ||
166 | protected: | 165 | protected: |
167 | virtual void receiveMessage( ChannelMessage *message, SendType type ) = 0; | 166 | virtual void receiveMessage( ChannelMessage *message, SendType type ) = 0; |
168 | 167 | ||
169 | private slots: | 168 | private slots: |