Skip to content
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.

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

Song editor scroll back #2145

Closed
midi-pascal opened this issue Jun 30, 2015 · 17 comments
Closed

Song editor scroll back #2145

midi-pascal opened this issue Jun 30, 2015 · 17 comments

Comments

@midi-pascal
Copy link
Contributor

A little feature missing in the song editor:
The last button "After stopping go back to begin" does what is supposed to do (the marker is back) but the song editor does not scroll back so you have to scroll manually to the beginning of the song.
I think this would be useful.

@BaraMGB
Copy link
Contributor

BaraMGB commented Jul 1, 2015

I think, the auto-scroll has a bug.

@BaraMGB
Copy link
Contributor

BaraMGB commented Jul 1, 2015

Oh, I tested only with an empty project. The auto-scroll follows the playhead only if there is something to play. I think that's not a bug it's a feature. But I can confirm the playhead jumps to start but the editor not.

@midi-pascal
Copy link
Contributor Author

@BaraMGB That's the point: the playhead is Ok but not the Song Editor. When you have a long piece of music, this is a real annoyance.

@tresf
Copy link
Member

tresf commented Aug 24, 2015

Closing as duplicate of meta-bug Better Playhead Auto-Scroll #2291. Please feel free to comment here if needed.

@midi-pascal
Copy link
Contributor Author

@tresf Sorry to bother you again. I pushed a fix for this issue in the same fork as the one I used for the previous PR.
Now the PR for issue 2401 contains the fix for this one too.
How can I "unpush" this fix from this github fork (master...midi-pascal:new_branch)?
The two issues are completely unrelated so I can push this one to my other fork.
Thanks!

@tresf
Copy link
Member

tresf commented Oct 20, 2015

Well, first, your sf2 changes shouldn't be in your master branch, that master branch should be even with upstream's master, so you'll probably want to fix that eventually.

In regards to the wrong branch, the easiest way is to back up your changes and hard-reset the sf2 branch to the previous good commit, which I just copied the first 7 characters from the last valid commit ID from the midi-pascal/new_branch by looking at the commits here:

https://github.com/midi-pascal/lmms/commits/new_branch

(browse to new_branch and replace the word tree in the URL with the word commits)

cp src/core/Song.cpp ~/Desktop/ # backup changes
git reset --hard 44e2b9f # force back to the sf2 commit
git push --force # rewrite history on the `new_branch` branch

Quite often, people will create an inverse patch, which adds a commit to the history which removes the bad commit. This is generally the preferred method when on upstream, but on a fork, you can rewrite history until your heart's content, it only affects your stuff.

If you had created the inverse patch, we could have used the pick/squash methods detailed in the other thread to clean up the commit history, there's more than one way to skin the cat, so to speak.

This bug report is already closed, but reminder, remember to put Closes #1234 in your commit or PR description if you wish to automatically close a bug report.

Last, I recommend not putting the bug ID in the title of a commit or PR, it is confusing to look at (you'll get stuff like Merge pull request #1234 #5678) and sometimes people click the wrong part of the link. Instead, put a newline in the commit comment and it will add it to the description rather than the title, which is much less confusing for those browsing via email or GitHub webpage.

@midi-pascal
Copy link
Contributor Author

@tresf Thanks again! My new_branch is clean now. I will try to clean my master branch by myself. One thing I do not quite understand: do I have to create a branch on github for each issue I work on? When I pushed my changes for this issue I thought I could create a new PR from it. It was added to the current PR instead. Hence an other goof...
you can be sure I will follow your recommendations when creating the next PR.

For this issue, I will add the information in the meta-issue. It enhances the usability of the stop options in the song editor (scroll back to the beginning or to the time line position, depending on the option selected with the 3 states button)

@tresf
Copy link
Member

tresf commented Oct 21, 2015

I made the same exact mistake. Yes, a branch for every PR. The PR is a living breathing branch. The upside is we can tweak before it gets accepted.

The downside is you end up with a lot of temporary branches.

@tresf
Copy link
Member

tresf commented Oct 22, 2015

@musikBear, do you have some time to test this feature out?

You can download the win32 version here:
https://github.com/tresf/lmms/releases/download/v1.1.90-ga95909e/lmms-1.0.96-ga95909e-win32.exe

@musikBear
Copy link

@tresf , do you have some time to test this feature out?

i will do that

@musikBear
Copy link

The execution fails
noentry

so the version does not execute on xpSp3-32
@tresf If you make a new binary, then include the patch for sf2. ( #2401) Then i can run a long test on that change too.
If you could let me know if it will be in the weekend, it would be appreciated.
I wont re-install my 1.1.3 before the next test, then :)

@tresf
Copy link
Member

tresf commented Oct 23, 2015

I'm not going to do the SF2 patch just yet since it has plenty of testing prior to merging.

The entry point error is often associated with very old Windows versions. You didn't try to run in compatiblity mode, right? Did you search around for that error to see what could be causing it?

@tresf
Copy link
Member

tresf commented Oct 23, 2015

@musikBear
Copy link

oh oh.. does not look nice for xp users -Question is now what percentage of the LMMS usergroup that actually still are on xp, -Has to end, true, but for how many
Can the previous survey enlighten ?

@tresf
Copy link
Member

tresf commented Oct 23, 2015

what percentage of the LMMS usergroup that actually still are on xp

Don't know, but if our toolchain won't support it, they'll have to download a legacy version.

@musikBear
Copy link

ya-

but in case it matters.. Mater from 24. sept. was the one i tested waxpins addons. That opened ok. Are there made significant changes in code since then?

@tresf
Copy link
Member

tresf commented Oct 23, 2015

Are there made significant changes in code since then?

We don't have direct control over our build tools. We use the mingw-w64 toolchain to build our software, and that updates regularly. Whether or not this specific Windows XP crash is attributed to a mingw change has yet to be determined, but we shouldn't spend too much time talking about it here, it is off topic.

In the mean time, if you would like to continue as a tester, you should prepare an environment suitable for running modern builds (This can be Linux, Windows or Mac; Linux and Windows can both be virtualized in something like VirtualBox if you decide to remain on XP as your base system).

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

No branches or pull requests

5 participants