Skip to content

Commit

Permalink
SongEditorPanel : move logic lower down, much metter
Browse files Browse the repository at this point in the history
fix #576
  • Loading branch information
jeremyz committed Apr 10, 2018
1 parent 125e296 commit 35f8d1c
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 19 deletions.
6 changes: 5 additions & 1 deletion src/core/include/hydrogen/basics/song.h
Expand Up @@ -264,9 +264,13 @@ class Song : public H2Core::Object
{
return __playback_track_enabled;
}
void set_playback_track_enabled( bool enabled )
bool set_playback_track_enabled( bool enabled )
{
if ( __playback_track_filename == NULL ) {
return false;
}
__playback_track_enabled = enabled;
return enabled;
}

float get_playback_track_volume()
Expand Down
2 changes: 1 addition & 1 deletion src/core/include/hydrogen/hydrogen.h
Expand Up @@ -238,7 +238,7 @@ class Hydrogen : public H2Core::Object
CoreActionController* getCoreActionController() const;

///playback track
void setPlaybackTrackState(bool);
bool setPlaybackTrackState(bool);
bool getPlaybackTrackState();
void loadPlaybackTrack(QString filename);

Expand Down
8 changes: 6 additions & 2 deletions src/core/src/hydrogen.cpp
Expand Up @@ -1837,10 +1837,14 @@ void Hydrogen::sequencer_stop()
Preferences::get_instance()->setRecordEvents(false);
}

void Hydrogen::setPlaybackTrackState(bool state)
bool Hydrogen::setPlaybackTrackState(bool state)
{
Song* pSong = getSong();
pSong->set_playback_track_enabled(state);
if ( pSong == NULL ) {
return false;
}

return pSong->set_playback_track_enabled(state);
}

void Hydrogen::loadPlaybackTrack(QString filename)
Expand Down
17 changes: 2 additions & 15 deletions src/gui/src/SongEditor/SongEditorPanel.cpp
Expand Up @@ -733,22 +733,9 @@ void SongEditorPanel::viewTimeLineBtnPressed( Button* pBtn )
void SongEditorPanel::mutePlaybackTrackBtnPressed( Button* pBtn )
{
Hydrogen* pEngine = Hydrogen::get_instance();
Song* pSong = pEngine->getSong();
bool state = true;

if ( state && pSong == NULL ) {
state = false;
}

if ( state && pSong->get_playback_track_filename() == NULL ) {
state = false;
}

if ( state ) {
state = !pBtn->isPressed();
}

pEngine->setPlaybackTrackState( state );
bool state = !pBtn->isPressed();
state = pEngine->setPlaybackTrackState( state );
m_pMutePlaybackToggleBtn->setPressed( !state );
}

Expand Down

0 comments on commit 35f8d1c

Please sign in to comment.