author | zecke <zecke> | 2004-09-24 15:09:56 (UTC) |
---|---|---|
committer | zecke <zecke> | 2004-09-24 15:09:56 (UTC) |
commit | 8e903cd3ea735adf066e156462602987691a4c69 (patch) (unidiff) | |
tree | b05fe7cc6d46cbacdc47fe3f0411100076bc8a52 /noncore/multimedia/opieplayer2/threadutil.h | |
parent | 478b2ead47a09956cadfacb8f469fb2fdee5531c (diff) | |
download | opie-8e903cd3ea735adf066e156462602987691a4c69.zip opie-8e903cd3ea735adf066e156462602987691a4c69.tar.gz opie-8e903cd3ea735adf066e156462602987691a4c69.tar.bz2 |
-Emit Progress from the xine Engine to Global::statusMessage
-Change ThreadUtil to pass data and const char* among threads
Diffstat (limited to 'noncore/multimedia/opieplayer2/threadutil.h') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/multimedia/opieplayer2/threadutil.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/noncore/multimedia/opieplayer2/threadutil.h b/noncore/multimedia/opieplayer2/threadutil.h index 2e83d3a..f97a18b 100644 --- a/noncore/multimedia/opieplayer2/threadutil.h +++ b/noncore/multimedia/opieplayer2/threadutil.h | |||
@@ -124,36 +124,40 @@ namespace ThreadUtil | |||
124 | int m_readFd; | 124 | int m_readFd; |
125 | int m_writeFd; | 125 | int m_writeFd; |
126 | QSocketNotifier *m_notifier; | 126 | QSocketNotifier *m_notifier; |
127 | }; | 127 | }; |
128 | 128 | ||
129 | 129 | ||
130 | class Channel; | 130 | class Channel; |
131 | 131 | ||
132 | class ChannelMessage | 132 | class ChannelMessage |
133 | { | 133 | { |
134 | friend class Channel; | 134 | friend class Channel; |
135 | public: | 135 | public: |
136 | ChannelMessage( int type = -1 ); | 136 | ChannelMessage( int type = -1, int data = -1, const char* msg = 0 ); |
137 | virtual ~ChannelMessage(); | 137 | virtual ~ChannelMessage(); |
138 | 138 | ||
139 | int type() const { return m_type; } | 139 | int type() const { return m_type; } |
140 | int data() const { return m_data; } | ||
141 | const char* msg()const { return m_msg; } | ||
140 | 142 | ||
141 | void reply(); | 143 | void reply(); |
142 | 144 | ||
143 | private: | 145 | private: |
144 | ChannelMessage( const ChannelMessage & ); | 146 | ChannelMessage( const ChannelMessage & ); |
145 | ChannelMessage &operator=( const ChannelMessage ); | 147 | ChannelMessage &operator=( const ChannelMessage ); |
146 | 148 | ||
147 | int m_type; | 149 | int m_type; |
150 | int m_data; | ||
151 | const char *m_msg; | ||
148 | bool m_isCall : 1; | 152 | bool m_isCall : 1; |
149 | bool m_replied : 1; | 153 | bool m_replied : 1; |
150 | bool m_inEventHandler : 1; | 154 | bool m_inEventHandler : 1; |
151 | Mutex m_guard; | 155 | Mutex m_guard; |
152 | WaitCondition m_condition; | 156 | WaitCondition m_condition; |
153 | }; | 157 | }; |
154 | 158 | ||
155 | class Channel : public QObject | 159 | class Channel : public QObject |
156 | { | 160 | { |
157 | Q_OBJECT | 161 | Q_OBJECT |
158 | public: | 162 | public: |
159 | enum SendType { OneWay, WaitForReply }; | 163 | enum SendType { OneWay, WaitForReply }; |