Skip to content

Commit

Permalink
Cleanup semantics of previous commit.
Browse files Browse the repository at this point in the history
  • Loading branch information
ddennedy committed Mar 7, 2015
1 parent e5a0634 commit b46eb2a
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions src/mltcontroller.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -306,7 +306,7 @@ void Controller::setVolume(double volume, bool muteOnPause)
m_volume = volume;

// Keep the consumer muted when paused
if (m_producer && m_producer->get_speed() == 0 && !muteOnPause) {
if (muteOnPause && m_producer && m_producer->get_speed() == 0) {
volume = 0.0;
}

Expand Down Expand Up @@ -353,7 +353,7 @@ void Controller::seek(int position)
}
if (m_jackFilter)
mlt_events_fire(m_jackFilter->get_properties(), "jack-seek", &position, NULL);
setVolume(m_volume, true);
setVolume(m_volume, false);
}

void Controller::refreshConsumer()
Expand Down
2 changes: 1 addition & 1 deletion src/mltcontroller.h
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ class Controller
virtual void pause();
void stop();
bool enableJack(bool enable = true);
void setVolume(double volume, bool muteOnPause = false);
void setVolume(double volume, bool muteOnPause = true);
double volume() const;
void onWindowResize();
virtual void seek(int position);
Expand Down

0 comments on commit b46eb2a

Please sign in to comment.