|
|
@ -33,6 +33,7 @@ void Player::Update(ofImage &img, bool show_frame){ |
|
|
|
if(videoPlayer.isLoaded() && !show_frame){ |
|
|
|
hasVideo = true; |
|
|
|
playerCurrentFrame = videoPlayer.getCurrentFrame(); |
|
|
|
std::cout << playerCurrentFrame << std::endl; |
|
|
|
videoPlayer.update(); |
|
|
|
aspect_ratio = videoPlayer.getWidth() / videoPlayer.getHeight(); |
|
|
|
} |
|
|
@ -92,7 +93,7 @@ void Player::SetVideoOnAwake(std::string path, ofFbo &fbo){ |
|
|
|
|
|
|
|
void Player::SetVideo(std::string path, std::string frame, bool is_active){ |
|
|
|
if(path.empty()){ |
|
|
|
path = "videos/demo.mp4"; |
|
|
|
path = "videos/output.mp4"; |
|
|
|
} |
|
|
|
|
|
|
|
/* convert str frame -> int (remove _x)*/ |
|
|
@ -113,8 +114,11 @@ void Player::SetVideo(std::string path, std::string frame, bool is_active){ |
|
|
|
} |
|
|
|
|
|
|
|
if(set_frame){ |
|
|
|
videoPlayer.setFrame(800); |
|
|
|
set_frame = false; |
|
|
|
if(videoPlayer.isPlaying() && playerCurrentFrame != f_number){ |
|
|
|
videoPlayer.setFrame(f_number); |
|
|
|
if(playerCurrentFrame == f_number) |
|
|
|
set_frame = false; |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|