diff --git a/daemon/src/sflthread.h b/daemon/src/sflthread.h index f1e4e94d14056f988ced335d1e7c0937ad347236..6fdeb2cead292d01f5f19ba8d50fbaf073025318 100644 --- a/daemon/src/sflthread.h +++ b/daemon/src/sflthread.h @@ -40,18 +40,18 @@ public: virtual ~SFLThread(); void start(); + +protected: + void exit(); void stop(); void join(); bool isRunning(); -protected: +private: virtual bool setup() { return true; }; virtual void process() {}; virtual void cleanup() {}; - void exit(); - -private: static void* run_(void*); void mainloop_(); pthread_t thread_; diff --git a/daemon/src/video/video_mixer.h b/daemon/src/video/video_mixer.h index add637f976944269c075ac5c97db04409a010111..d1b8739d96250a25262369e24714a620187f2f5a 100644 --- a/daemon/src/video/video_mixer.h +++ b/daemon/src/video/video_mixer.h @@ -57,10 +57,10 @@ public: int getWidth() const; int getHeight() const; +private: // threading void process(); -private: NON_COPYABLE(VideoMixer); void waitForUpdate(); diff --git a/daemon/src/video/video_receive_thread.h b/daemon/src/video/video_receive_thread.h index 0a23e0f390ffdbcd1ff2ffb147e8d0a669e5fe35..cea6317f057118c3756bf5523c664808ed2859cd 100644 --- a/daemon/src/video/video_receive_thread.h +++ b/daemon/src/video/video_receive_thread.h @@ -82,7 +82,6 @@ private: void renderFrame(); static int readFunction(void *opaque, uint8_t *buf, int buf_size); -protected: // threading bool setup(); void process(); diff --git a/daemon/src/video/video_send_thread.h b/daemon/src/video/video_send_thread.h index cedd84338ca1b7610b11af77d6ff8d84601a002c..463ba833851934b7db1b8b8ca54b50ae01c95334 100644 --- a/daemon/src/video/video_send_thread.h +++ b/daemon/src/video/video_send_thread.h @@ -52,13 +52,12 @@ public: std::string getSDP() const { return sdp_; } void forceKeyFrame(); -protected: +private: // threading bool setup(); void process(); void cleanup(); -private: NON_COPYABLE(VideoSendThread); static int interruptCb(void *ctx);