Skip to content

h #18

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

Merged
LostRobotMusic merged 26 commits into from
May 8, 2020
Merged

h #18

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
26 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
2aea19f
Add "Open containing folder" (#5453)
michaelgregorius Apr 14, 2020
b85aef2
Code review changes
michaelgregorius Apr 19, 2020
c37fdd0
Code review changes (comment added)
michaelgregorius Apr 21, 2020
abcfee1
disable drag after drawing line (#5315)
tecknixia Apr 22, 2020
31996fe
Merge pull request #5454 from michaelgregorius/5453-OpenContainingFolder
michaelgregorius Apr 23, 2020
aec0dd3
If AutomationPattern has a single tick at 0, set it's length to 1 bar.
Veratil Apr 26, 2020
a4f6773
Add comments and reduce unnecessary code
Veratil Apr 26, 2020
9efb6f9
Merge pull request #5469 from Veratil/issue-5254
Spekular Apr 26, 2020
e199f72
Fix crash on drawing line on the end of a graph (#5471)
PhysSong Apr 28, 2020
7c2c77c
Mergefix
Spekular Apr 29, 2020
b46ea0e
refactor
Spekular Apr 29, 2020
5821466
Fix indicator in BB editor
Spekular Apr 29, 2020
c755b56
Piano roll vertical zoom (#5442)
akimaze Apr 30, 2020
ae2af96
Use nullptr instead of NULL
Spekular Apr 30, 2020
aaf94ef
Formatting chananges
Spekular Apr 30, 2020
0c180b8
Nicer spacing in activity indicator's setGeometry call
Spekular May 1, 2020
9ed5f80
Refactor palette update on un/mute
Spekular May 1, 2020
e643f83
Merge branch 'SampleIndicator' of https://github.com/Spekular/lmms in…
Spekular May 1, 2020
c18edd4
Use local cursor instead of global one in PianoRoll (#5200)
PhysSong May 3, 2020
6095bbc
Merge pull request #5477 from Spekular/SampleIndicator
Spekular May 4, 2020
1a6f4c1
Add option to move SideBar to right side of window (#5114)
Veratil May 5, 2020
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
Fix triggering of stop animation when playing no samples after stoppi… 
…ng song playing samples
  • Loading branch information
@serdnab
serdnab committed Nov 19, 2019
commit df3e3883935fe71976f34ef97ce92f835985ccbf
5 changes: 5 additions & 0 deletions include/SampleTrack.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,6 +167,11 @@ class SampleTrack : public Track
return m_wasPlaying;
}

void setWasPlaying(bool wasPlaying)
{
m_wasPlaying = wasPlaying;
}

signals:
void playing();
void notPlaying();
Expand Down
4 changes: 3 additions & 1 deletion src/tracks/SampleTrack.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -984,9 +984,11 @@ void SampleTrackView::dropEvent(QDropEvent *de)

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

Expand Down