eessppeelllloo/vimix
1
0
Fork 0
mirror of https://github.com/brunoherbelin/vimix.git synced 2025-12-11 18:34:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup

Browse Source
This commit is contained in:
brunoherbelin
2020-07-13 23:30:03 +02:00
parent 0d6ec67720
commit 45d69020dd
2 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
MediaPlayer.cpp
View File

@@ -56,9 +56,6 @@ MediaPlayer::MediaPlayer(string name) : id_(name)
loop_ = LoopMode::LOOP_REWIND; loop_ = LoopMode::LOOP_REWIND;
current_segment_ = segments_.begin(); current_segment_ = segments_.begin();
// v_frame_.buffer = nullptr;
// v_frame_is_full_ = false;
vframe_write_index_ = 0; vframe_write_index_ = 0;
vframe_read_index_ = 0; vframe_read_index_ = 0;
for(guint i = 0; i < N_VFRAME; i++){ for(guint i = 0; i < N_VFRAME; i++){
@@ -652,7 +649,7 @@ void MediaPlayer::update()
vframe_lock_[vframe_read_index_].unlock(); vframe_lock_[vframe_read_index_].unlock();
} }
vframe_read_index_ = (vframe_read_index_ +1) %2; vframe_read_index_ = (vframe_read_index_ +1) % N_VFRAME;
// manage loop mode // manage loop mode
if (need_loop_ && !isimage_) { if (need_loop_ && !isimage_) {
@@ -800,7 +797,7 @@ bool MediaPlayer::fill_v_frame(GstBuffer *buf)
if ( vframe_lock_[i].try_lock()) { if ( vframe_lock_[i].try_lock()) {
// always empty frame before filling it again // always empty frame before filling it again
if (vframe_[i].buffer) if (vframe_[vframe_write_index_].buffer)
gst_video_frame_unmap(&vframe_[vframe_write_index_]); gst_video_frame_unmap(&vframe_[vframe_write_index_]);
@@ -831,7 +828,7 @@ bool MediaPlayer::fill_v_frame(GstBuffer *buf)
start_position_ = vframe_position_[vframe_write_index_]; start_position_ = vframe_position_[vframe_write_index_];
// dual VFRAME mechanism // dual VFRAME mechanism
vframe_write_index_ = (vframe_write_index_ + 1) % 2; vframe_write_index_ = (vframe_write_index_ + 1) % N_VFRAME;
} }
} }

2
UserInterfaceManager.cpp
View File

@@ -888,7 +888,7 @@ void UserInterface::showMediaPlayer(MediaPlayer *mp)
mediacontrol.setMediaPlayer(mp); mediacontrol.setMediaPlayer(mp);
} }
#define LABEL_AUTO_MEDIA_PLAYER "Play active source" #define LABEL_AUTO_MEDIA_PLAYER "Active source"
MediaController::MediaController() : mp_(nullptr), current_(LABEL_AUTO_MEDIA_PLAYER), follow_active_source_(true), media_playing_mode_(false) MediaController::MediaController() : mp_(nullptr), current_(LABEL_AUTO_MEDIA_PLAYER), follow_active_source_(true), media_playing_mode_(false)
{ {