Skip to content

Sampletrack activity indicator #5307

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
serdnab wants to merge 5 commits into from
Closed

Sampletrack activity indicator #5307

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4d9e5e3
Sampletrack activity indicator
serdnab Nov 5, 2019
caaeb62
Moved the activity indicator mute code to parent class
serdnab Nov 7, 2019
e056ecb
Added to sampletrackview the code needed for the activity indicator m…
serdnab Nov 8, 2019
229de18
Fixed triggering of stop animation when not playing
serdnab Nov 18, 2019
df3e388
Fix triggering of stop animation when playing no samples after stoppi…
serdnab Nov 19, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fixed triggering of stop animation when not playing
  • Loading branch information
@serdnab
serdnab committed Nov 18, 2019
commit 229de18bc0608220e281249990296e5a908d91e7
6 changes: 6 additions & 0 deletions include/SampleTrack.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,6 +162,11 @@ class SampleTrack : public Track
return "sampletrack";
}

bool wasPlaying()
{
return m_wasPlaying;
}

signals:
void playing();
void notPlaying();
Expand Down Expand Up @@ -215,6 +220,7 @@ class SampleTrackView : public TrackView

public slots:
void showEffects();
void stopPlaying();


protected:
Expand Down
12 changes: 11 additions & 1 deletion src/tracks/SampleTrack.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -866,7 +866,7 @@ SampleTrackView::SampleTrackView( SampleTrack * _t, TrackContainerView* tcv ) :
connect(_t, SIGNAL(notPlaying()),
m_activityIndicator, SLOT(notPlaying()));
connect(Engine::getSong(), SIGNAL(stopped()),
m_activityIndicator, SLOT(notPlaying()));
this, SLOT(stopPlaying()));

setModel( _t );

Expand Down Expand Up @@ -982,6 +982,16 @@ void SampleTrackView::dropEvent(QDropEvent *de)



void SampleTrackView::stopPlaying()
{
if (dynamic_cast<SampleTrack*>(getTrack())->wasPlaying())
{
m_activityIndicator->notPlaying();
}
}




SampleTrackWindow::SampleTrackWindow(SampleTrackView * tv) :
QWidget(),
Expand Down