diff --git a/libeplayer3/include/input.h b/libeplayer3/include/input.h index 9f58f92..53a7139 100644 --- a/libeplayer3/include/input.h +++ b/libeplayer3/include/input.h @@ -26,9 +26,7 @@ #include #include -#include -#include -#include +#include extern "C" { #include @@ -48,7 +46,7 @@ class Input friend int interrupt_cb(void *arg); private: - OpenThreads::Mutex mutex; + Mutex mutex; Track *videoTrack; Track *audioTrack; diff --git a/libeplayer3/include/manager.h b/libeplayer3/include/manager.h index 364595b..41ef416 100644 --- a/libeplayer3/include/manager.h +++ b/libeplayer3/include/manager.h @@ -26,9 +26,7 @@ #include #include -#include -#include -#include +#include extern "C" { #include @@ -66,7 +64,7 @@ class Manager private: Player *player; - OpenThreads::Mutex mutex; + Mutex mutex; std::map videoTracks, audioTracks, subtitleTracks, teletextTracks; std::map Programs; void addTrack(std::map &tracks, Track &track); diff --git a/libeplayer3/include/output.h b/libeplayer3/include/output.h index 7090703..4b024fa 100644 --- a/libeplayer3/include/output.h +++ b/libeplayer3/include/output.h @@ -26,9 +26,7 @@ #include #include -#include -#include -#include +#include extern "C" { #include @@ -50,7 +48,7 @@ class Output int videofd; int audiofd; Writer *videoWriter, *audioWriter; - OpenThreads::Mutex audioMutex, videoMutex; + Mutex audioMutex, videoMutex; AVStream *audioStream, *videoStream; Player *player; public: diff --git a/libeplayer3/include/player.h b/libeplayer3/include/player.h index 9926d1e..a452374 100644 --- a/libeplayer3/include/player.h +++ b/libeplayer3/include/player.h @@ -21,9 +21,7 @@ #ifndef __PLAYER_H__ #define __PLAYER_H__ -#include -#include -#include +#include extern "C" { #include @@ -63,7 +61,7 @@ class Player { Input input; Output output; Manager manager; - OpenThreads::Mutex chapterMutex; + Mutex chapterMutex; std::vector chapters; pthread_t playThread; diff --git a/libeplayer3/input.cpp b/libeplayer3/input.cpp index b30b786..273a709 100644 --- a/libeplayer3/input.cpp +++ b/libeplayer3/input.cpp @@ -280,17 +280,17 @@ static int lock_callback(void **mutex, enum AVLockOp op) { switch (op) { case AV_LOCK_CREATE: - *mutex = (void *) new OpenThreads::Mutex; + *mutex = (void *) new Mutex; return !*mutex; case AV_LOCK_DESTROY: - delete static_cast(*mutex); + delete static_cast(*mutex); *mutex = NULL; return 0; case AV_LOCK_OBTAIN: - static_cast(*mutex)->lock(); + static_cast(*mutex)->lock(); return 0; case AV_LOCK_RELEASE: - static_cast(*mutex)->unlock(); + static_cast(*mutex)->unlock(); return 0; default: return -1; @@ -589,7 +589,7 @@ bool Input::Stop() usleep(100000); if (avfc) { - OpenThreads::ScopedLock lock(mutex); + ScopedLock lock(mutex); for (unsigned int i = 0; i < avfc->nb_streams; i++) avcodec_close(avfc->streams[i]->codec); avformat_close_input(&avfc); diff --git a/libeplayer3/manager.cpp b/libeplayer3/manager.cpp index da39024..275205c 100644 --- a/libeplayer3/manager.cpp +++ b/libeplayer3/manager.cpp @@ -25,7 +25,7 @@ void Manager::addTrack(std::map &tracks, Track &track) { - OpenThreads::ScopedLock m_lock(mutex); + ScopedLock m_lock(mutex); std::map::iterator it = tracks.find(track.pid); if (it == tracks.end()) { Track *t = new Track; @@ -59,7 +59,7 @@ std::vector Manager::getTracks(std::map &tracks) { player->input.UpdateTracks(); std::vector res; - OpenThreads::ScopedLock m_lock(mutex); + ScopedLock m_lock(mutex); for(std::map::iterator it = tracks.begin(); it != tracks.end(); ++it) if (!it->second->inactive && !it->second->hidden) res.push_back(*it->second); @@ -88,7 +88,7 @@ std::vector Manager::getTeletextTracks() Track *Manager::getTrack(std::map &tracks, int pid) { - OpenThreads::ScopedLock m_lock(mutex); + ScopedLock m_lock(mutex); std::map::iterator it = tracks.find(pid); if (it != tracks.end() && !it->second->inactive) return it->second; @@ -116,7 +116,7 @@ Track *Manager::getTeletextTrack(int pid) bool Manager::initTrackUpdate() { - OpenThreads::ScopedLock m_lock(mutex); + ScopedLock m_lock(mutex); for (std::map::iterator it = audioTracks.begin(); it != audioTracks.end(); ++it) it->second->inactive = !it->second->is_static; @@ -140,7 +140,7 @@ void Manager::addProgram(Program &program) std::vector Manager::getPrograms(void) { - OpenThreads::ScopedLock m_lock(mutex); + ScopedLock m_lock(mutex); std::vector res; for (std::map::iterator it = Programs.begin(); it != Programs.end(); ++it) res.push_back(it->second); @@ -149,7 +149,7 @@ std::vector Manager::getPrograms(void) bool Manager::selectProgram(const int id) { - OpenThreads::ScopedLock m_lock(mutex); + ScopedLock m_lock(mutex); std::map::iterator i = Programs.find(id); if (i != Programs.end()) { @@ -236,7 +236,7 @@ bool Manager::selectProgram(const int id) void Manager::clearTracks() { - OpenThreads::ScopedLock m_lock(mutex); + ScopedLock m_lock(mutex); for (std::map::iterator it = audioTracks.begin(); it != audioTracks.end(); ++it) delete it->second; diff --git a/libeplayer3/output.cpp b/libeplayer3/output.cpp index 6855824..33fa5ee 100644 --- a/libeplayer3/output.cpp +++ b/libeplayer3/output.cpp @@ -66,9 +66,9 @@ Output::~Output() bool Output::Open() { - OpenThreads::ScopedLock v_lock(videoMutex); - OpenThreads::ScopedLock a_lock(audioMutex); - + ScopedLock v_lock(videoMutex); + ScopedLock a_lock(audioMutex); + if (videofd < 0) videofd = open(VIDEODEV, O_RDWR); @@ -100,8 +100,8 @@ bool Output::Close() { Stop(); - OpenThreads::ScopedLock v_lock(videoMutex); - OpenThreads::ScopedLock a_lock(audioMutex); + ScopedLock v_lock(videoMutex); + ScopedLock a_lock(audioMutex); if (videofd > -1) { close(videofd); @@ -122,8 +122,8 @@ bool Output::Play() { bool ret = true; - OpenThreads::ScopedLock v_lock(videoMutex); - OpenThreads::ScopedLock a_lock(audioMutex); + ScopedLock v_lock(videoMutex); + ScopedLock a_lock(audioMutex); AVCodecContext *avcc; @@ -149,8 +149,8 @@ bool Output::Stop() { bool ret = true; - OpenThreads::ScopedLock v_lock(videoMutex); - OpenThreads::ScopedLock a_lock(audioMutex); + ScopedLock v_lock(videoMutex); + ScopedLock a_lock(audioMutex); if (videofd > -1) { ioctl(videofd, VIDEO_CLEAR_BUFFER, NULL); @@ -175,8 +175,8 @@ bool Output::Pause() { bool ret = true; - OpenThreads::ScopedLock v_lock(videoMutex); - OpenThreads::ScopedLock a_lock(audioMutex); + ScopedLock v_lock(videoMutex); + ScopedLock a_lock(audioMutex); if (videofd > -1) { if (dioctl(videofd, VIDEO_FREEZE, NULL)) @@ -195,8 +195,8 @@ bool Output::Continue() { bool ret = true; - OpenThreads::ScopedLock v_lock(videoMutex); - OpenThreads::ScopedLock a_lock(audioMutex); + ScopedLock v_lock(videoMutex); + ScopedLock a_lock(audioMutex); if (videofd > -1 && dioctl(videofd, VIDEO_CONTINUE, NULL)) ret = false; @@ -209,7 +209,7 @@ bool Output::Continue() bool Output::Mute(bool b) { - OpenThreads::ScopedLock a_lock(audioMutex); + ScopedLock a_lock(audioMutex); //AUDIO_SET_MUTE has no effect with new player return audiofd > -1 && !dioctl(audiofd, b ? AUDIO_STOP : AUDIO_PLAY, NULL); } @@ -219,8 +219,8 @@ bool Output::Flush() { bool ret = true; - OpenThreads::ScopedLock v_lock(videoMutex); - OpenThreads::ScopedLock a_lock(audioMutex); + ScopedLock v_lock(videoMutex); + ScopedLock a_lock(audioMutex); if (videofd > -1 && ioctl(videofd, VIDEO_FLUSH, NULL)) ret = false; @@ -241,31 +241,31 @@ bool Output::Flush() bool Output::FastForward(int speed) { - OpenThreads::ScopedLock v_lock(videoMutex); + ScopedLock v_lock(videoMutex); return videofd > -1 && !dioctl(videofd, VIDEO_FAST_FORWARD, speed); } bool Output::SlowMotion(int speed) { - OpenThreads::ScopedLock v_lock(videoMutex); + ScopedLock v_lock(videoMutex); return videofd > -1 && !dioctl(videofd, VIDEO_SLOWMOTION, speed); } bool Output::AVSync(bool b) { - OpenThreads::ScopedLock a_lock(audioMutex); + ScopedLock a_lock(audioMutex); return audiofd > -1 && !dioctl(audiofd, AUDIO_SET_AV_SYNC, b); } bool Output::ClearAudio() { - OpenThreads::ScopedLock a_lock(audioMutex); + ScopedLock a_lock(audioMutex); return audiofd > -1 && !ioctl(audiofd, AUDIO_CLEAR_BUFFER, NULL); } bool Output::ClearVideo() { - OpenThreads::ScopedLock v_lock(videoMutex); + ScopedLock v_lock(videoMutex); return videofd > -1 && !ioctl(videofd, VIDEO_CLEAR_BUFFER, NULL); } @@ -297,7 +297,7 @@ bool Output::GetFrameCount(int64_t &framecount) bool Output::SwitchAudio(AVStream *stream) { - OpenThreads::ScopedLock a_lock(audioMutex); + ScopedLock a_lock(audioMutex); if (stream == audioStream) return true; if (audiofd > -1) { @@ -321,7 +321,7 @@ bool Output::SwitchAudio(AVStream *stream) bool Output::SwitchVideo(AVStream *stream) { - OpenThreads::ScopedLock v_lock(videoMutex); + ScopedLock v_lock(videoMutex); if (stream == videoStream) return true; if (videofd > -1) { @@ -347,11 +347,11 @@ bool Output::Write(AVStream *stream, AVPacket *packet, int64_t pts) { switch (stream->codec->codec_type) { case AVMEDIA_TYPE_VIDEO: { - OpenThreads::ScopedLock v_lock(videoMutex); + ScopedLock v_lock(videoMutex); return videofd > -1 && videoWriter && videoWriter->Write(packet, pts); } case AVMEDIA_TYPE_AUDIO: { - OpenThreads::ScopedLock a_lock(audioMutex); + ScopedLock a_lock(audioMutex); return audiofd > -1 && audioWriter && audioWriter->Write(packet, pts); } default: diff --git a/libeplayer3/player.cpp b/libeplayer3/player.cpp index 21d3bad..3fa5580 100644 --- a/libeplayer3/player.cpp +++ b/libeplayer3/player.cpp @@ -370,7 +370,7 @@ bool Player::GetChapters(std::vector &positions, std::vector & positions.clear(); titles.clear(); input.UpdateTracks(); - OpenThreads::ScopedLock m_lock(chapterMutex); + ScopedLock m_lock(chapterMutex); for (std::vector::iterator it = chapters.begin(); it != chapters.end(); ++it) { positions.push_back(it->start/1000); titles.push_back(it->title); @@ -380,7 +380,7 @@ bool Player::GetChapters(std::vector &positions, std::vector & void Player::SetChapters(std::vector &Chapters) { - OpenThreads::ScopedLock m_lock(chapterMutex); + ScopedLock m_lock(chapterMutex); chapters = Chapters; }