Skip to content

Commit 1209606

Browse files
committed
removed volume control from video player, videos will be just videos
1 parent 0deaf31 commit 1209606

File tree

2 files changed

+4
-19
lines changed

2 files changed

+4
-19
lines changed

src/objects/video/VideoPlayer.cpp

Lines changed: 4 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
//--------------------------------------------------------------
3838
VideoPlayer::VideoPlayer() : PatchObject("video player"){
3939

40-
this->numInlets = 5;
40+
this->numInlets = 4;
4141
this->numOutlets = 2;
4242

4343
_inletParams[0] = new string(); // control
@@ -46,10 +46,8 @@ VideoPlayer::VideoPlayer() : PatchObject("video player"){
4646
*(float *)&_inletParams[1] = 0.0f;
4747
_inletParams[2] = new float(); // speed
4848
*(float *)&_inletParams[2] = 0.0f;
49-
_inletParams[3] = new float(); // volume
49+
_inletParams[3] = new float(); // trigger
5050
*(float *)&_inletParams[3] = 0.0f;
51-
_inletParams[4] = new float(); // trigger
52-
*(float *)&_inletParams[4] = 0.0f;
5351

5452
_outletParams[0] = new ofTexture(); // output
5553
_outletParams[1] = new float(); // finish bang
@@ -65,7 +63,6 @@ VideoPlayer::VideoPlayer() : PatchObject("video player"){
6563
nameLabelLoaded = false;
6664

6765
loop = false;
68-
volume = 0.0f;
6966
speed = 1.0f;
7067

7168
posX = posY = drawW = drawH = 0.0f;
@@ -96,7 +93,6 @@ void VideoPlayer::newObject(){
9693
this->addInlet(VP_LINK_STRING,"control");
9794
this->addInlet(VP_LINK_NUMERIC,"playhead");
9895
this->addInlet(VP_LINK_NUMERIC,"speed");
99-
this->addInlet(VP_LINK_NUMERIC,"volume");
10096
this->addInlet(VP_LINK_NUMERIC,"bang");
10197

10298
this->addOutlet(VP_LINK_TEXTURE,"output");
@@ -200,15 +196,9 @@ void VideoPlayer::drawObjectContent(ofTrueTypeFont *font, shared_ptr<ofBaseGLRen
200196
speed = *(float *)&_inletParams[2];
201197
video->setSpeed(speed);
202198
}
203-
// volume
204-
if(this->inletsConnected[3]){
205-
volume = ofClamp(*(float *)&_inletParams[3],0.0f,1.0f);
206-
video->setVolume(volume);
207-
}
208-
209199
// trigger
210-
if(this->inletsConnected[4]){
211-
if(ofClamp(*(float *)&_inletParams[4],0.0f,1.0f) == 1.0f){
200+
if(this->inletsConnected[3]){
201+
if(ofClamp(*(float *)&_inletParams[3],0.0f,1.0f) == 1.0f){
212202
video->firstFrame();
213203
video->play();
214204
}
@@ -402,10 +392,6 @@ void VideoPlayer::drawObjectNodeConfig(){
402392
if(ImGui::SliderFloat("SPEED",&speed,-1.0f, 1.0f)){
403393
video->setSpeed(speed);
404394
}
405-
ImGui::PushItemWidth(130*this->scaleFactor);
406-
if(ImGui::SliderFloat("VOLUME",&volume,0.0f, 1.0f)){
407-
video->setVolume(volume);
408-
}
409395
ImGui::Spacing();
410396
ImGui::Spacing();
411397
if(ImGui::Checkbox("LOOP " ICON_FA_REDO,&loop)){

src/objects/video/VideoPlayer.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,6 @@ class VideoPlayer : public PatchObject {
7171
bool finishBang;
7272
bool preloadFirstFrame;
7373

74-
float volume;
7574
float speed;
7675
bool loop;
7776

0 commit comments

Comments
 (0)