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.

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

Jump to bottom

Couple the editor waveform timeline to the audio #2617

Merged
merged 15 commits into from
Jun 17, 2018
Merged

Couple the editor waveform timeline to the audio #2617

merged 15 commits into from
Jun 17, 2018

Conversation

smoogipoo
Copy link
Contributor

@smoogipoo smoogipoo commented May 23, 2018 •
edited by peppy
Loading

Prereqs:

If the track is playing:

  • Wheel input doesn't do anything.
  • Timeline follows the audio.
  • If user click-drags:
    • Audio stops.
    • Timeline scrolls with mouse, audio follows timeline.
    • No flicking / smooth scrolling.
    • Audio resumes upon releasing mouse.

If the track isn't playing:

  • Retains smooth scrolling.

Video: https://streamable.com/guinl

@smoogipoo smoogipoo added this to the Candidate Issues milestone May 23, 2018
@smoogipoo smoogipoo mentioned this pull request May 25, 2018
Merged
2 tasks
smoogipoo and others added 3 commits June 12, 2018 14:22
@smoogipoo
Merge remote-tracking branch 'origin/master' into timeline-audio-scro…
30b7b79 
…lling

# Conflicts:
#	osu-framework
#	osu.Game.Tests/Visual/TestCaseEditorComposeTimeline.cs
#	osu.Game/Screens/Edit/Screens/Compose/Timeline/Timeline.cs
@smoogipoo
Merge branch 'master' into timeline-audio-scrolling
f71b045
@smoogipoo
Remove unused variable
b90cdfb
This was referenced Jun 12, 2018
Merged
Closed
Merged
@peppy
Copy link
Sponsor Member

peppy commented Jun 12, 2018

TestCaseEditorComposeTimeline is crashing with:

image

Is this expected?

@peppy
Copy link
Sponsor Member

peppy commented Jun 12, 2018 •
edited
Loading

The test case doesn't play music and doesn't seem to be usable for me.

Volume warning https://puu.sh/ADQjL/0ec4cb9b64.mp4

@peppy
Copy link
Sponsor Member

peppy commented Jun 15, 2018

Is adding the circles.ogg a second time required? Can we not just use the resources copy (the resources project is already referenced so it should be accessible).

@smoogipoo
Copy link
Contributor Author

The one in the resources rests within a .osz.

@peppy peppy merged commit 3c26556 into ppy:master Jun 17, 2018
@smoogipoo smoogipoo deleted the timeline-audio-scrolling branch May 21, 2021 07:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@peppy peppy peppy approved these changes

Assignees
No one assigned
Labels
area:editor
Projects
None yet
Milestone
Candidate Issues
Development

Successfully merging this pull request may close these issues.
2 participants
@smoogipoo @peppy