-
-
Notifications
You must be signed in to change notification settings - Fork 1k
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
Enable sample track recording #3947
Closed
Closed
Changes from 35 commits
Commits
Show all changes
160 commits
Select commit
Hold shift + click to select a range
1971879
SampleTrack: Uncomment disabled recording-related code.
Reflexe 5a08e9e
SampleTrack: Fix TCO not being played on the first tick (if it starts on
Reflexe 44fa0c5
AudioJack: Basic implementation of capture (without AUDIO_PORT_SUPPORT)
Reflexe 59964e7
Mixer & PlayHandle: Support PlayHandle without audioPort and set
Reflexe ce020f6
Some changes to jack capture.
Reflexe 29d7237
(minor & style): Spaces to tabs.
Reflexe dcc4424
AudioSdl: Add support for full SDL2 with float samples and recording
Reflexe 9df983f
Mixer -> pushInputFrames: Add an option to automaticly normalize input
Reflexe 5735f6f
AudioPulseAudio: Switch playback sample type to float and add capture
Reflexe cdc7474
Track -> SampleTrack: Do not save start time offset for empty
Reflexe 1c27958
AudioJack: Allocate and deallocate m_tempInBufs.
Reflexe 0aa2631
SampleTrack: Make sure an empty TCO with isRecord would still be
Reflexe b37c451
SampleTrack: Reset the start time offset when importing a new
Reflexe ad6cd48
SampleRecordHandle: Apply start offset to reocrded TCO.
Reflexe 2706271
Track, TrackView: Instead of trying every possible `dynamic_cast` in
Reflexe 5790a38
SampleTrack Recording: Add per SampleTrack and a global fallback for the
Reflexe 834d36b
Editor -> Style: Reorder editor buttons.
Reflexe c436f9d
SampleTrack -> RecordingChannel: Remove the default option, instead, all
Reflexe 17849f5
SampleTrack: Change recordingChannel menu label.
Reflexe e3c4b6a
SampleTrack: In a case of recording, play a sample TCO even if its
Reflexe e1d43f5
SampleRecordHandle: Obtain the offset to the record with a parameter
Reflexe b4a7202
AudioJack: Fix a deadblock on exporting a sample with different sample
Reflexe dcf98d3
SongEditor: Hide the global channel selection toolbox when capture
Reflexe fedbd31
AudioSdl: Set isCapture to 0 for the output device.
Reflexe bba871d
SongEditor: (re-)Fix hiding the channel selection tool when recording is
Reflexe 8a60410
Style: Replace spaces with tabs.
Reflexe 1b4a663
SongEditor: Hide the record button.
Reflexe f1843c1
Style: Remove unnecessary tabs.
Reflexe be77b33
AudioSdl: Use NULL for device names in order to get the default device.
Reflexe 334abdc
Bugfix - SampleTrack -> Load & Save: Fix recorded sample track not being
Reflexe 205ec07
Bugfix - SampleTrack -> Play: Fix sample track not being played in the
Reflexe 4b4e8cd
SampleTrack -> Recording: Enable per-track record setting and
Reflexe 228927e
SampleTrack: On project save, save the values of SampleTrack::m_record
Reflexe 0deafa3
SampleTrack -> Minor: Reorder the constructor initialization order to
Reflexe d46f363
Merge branch 'master' of https://github.com/LMMS/lmms
Reflexe f252746
Merge branch 'master' into master
Reflexe f23723e
AudioSDL -> SDL2: Fix a crash from calling a SDL1 function instead of
Reflexe ea3c766
Merge branch 'master' of github.com:Reflexe/lmms
Reflexe b860d9f
AudioJack -> Style: Remove tailing whitespaces.
Reflexe e84b99a
Merge branch 'master' of https://github.com/LMMS/lmms
Reflexe 8766066
Travis: Use SDL2 on Windows.
Reflexe 051f88e
Travis: Attempt to install std2 on MinGW by installing raw binary
Reflexe d422a6b
Travis -> Improvments for the sdl2 install
Reflexe 3e9f8e8
Travis > Try to install SDL2 with cross option.
Reflexe d368e74
Travis > SDL2: Add sudo
Reflexe 5f97762
Travis -> SDL2: Remove the directory AFTER you get out of there.
Reflexe d98f77b
Travis -> SDL2: Another try...
Reflexe d25ffe0
Travis -> SDL2: :(
Reflexe 67785c4
Travis -> SDL2: Will it work?
Reflexe 5191183
Travis -> SDL2: Maybe now?
Reflexe fc00754
Travis -> SDL2: Maybe? :(
Reflexe ad7d16b
And now?
Reflexe 304478c
Bash != Fun
Reflexe e134375
AudioSdl: (hopefully) solve a problem with a qMin error.
Reflexe 5f8a023
Travis -> SDL2: Add "" around OPTS
Reflexe e4360ef
Revert "Travis -> SDL2: Add "" around OPTS"
Reflexe bbc8555
Travis -> InstallRaw: Fix Shellcheck warnings.
Reflexe 8497c47
Travis -> Linux: Use SDL2 by default.
Reflexe f20c0bd
CMake -> Install: Install SDL2.dll instead of SDL.dll.
Reflexe c2ba2f6
AudioJack: Connect capture stream to LMMS by default.
Reflexe 3743ebd
AudioJack: Stupid me forgot one |.
Reflexe f6b8d60
AudioSdl -> Recording - Bugfix: Due to spec.sampleRate being wrong,
Reflexe 59b033e
Travis -> SDL2: Install the SDL2 package for windows and remove the old
Reflexe e1c884c
Merge branch 'master' of https://github.com/LMMS/lmms
Reflexe 46dbc8c
Travos -> SDL2: add toby's PPA.
Reflexe b4e02db
Travis: Maybe now?
Reflexe 10b17cf
.
Reflexe 87c18e8
.
Reflexe 1d46f5d
.
Reflexe c03e5c9
.
Reflexe 6ca126d
.
Reflexe 70e6e85
.
Reflexe 80ef8e5
.
Reflexe 02c7106
.
Reflexe 19fac16
Revent my trying to use Toby's PPA: it does not support trusty.
Reflexe 88df2ca
Style -> SampleTrack Recording: Paint recorded sampletrack red (intead
Reflexe 7cba7a9
Style: spaces to tabs.
Reflexe d627e90
basics: Change sampleFrame to `std::array<sample_t, DEFAULT_CHANNELS>`
Reflexe 67074d2
SampleBuffer: Internally change buffer to std::vector and support
Reflexe 7b987a6
SampleRecordHandle and SampleTrack: Support in-recording updating and
Reflexe 4248caa
CMakeLists.txt: Require libsamplerate to be at least 0.1.9 in order to
Reflexe c019b06
Merge origin/master to use circleCI
Reflexe 797aa27
Fixup a few merge errors.
Reflexe 960b50b
Fixup merge
Reflexe d5cc4b1
Merge remote-tracking branch 'origin/master'
Reflexe 640f577
Fixup previous merge
Reflexe c02f021
Merge branch 'master' of github.com:Reflexe/lmms
Reflexe 08c0cdb
SampleBuffer and libsamplerate: revent back to libsamplerate `0.1.8` in
Reflexe 5fc4eff
Revent changes in norminizing SampleBuffer path.
Reflexe d19be2e
SamplePlayHandle: Fix double-free, when the handle thinks it has an
Reflexe 6bb07d4
Recording and SampleTrack: Remove setSampleBuffer and introduce
Reflexe 6e2fa43
CircleCI: Upload Win{32,64} artifacts.
Reflexe a25d0b4
Try to support CircleCI windows artifacts.
Reflexe 3424e39
I hope it will work now.
Reflexe e8fd490
Plz work now
Reflexe 95b8997
Now?
Reflexe e86bf65
Revert "Now?"
Reflexe 37a74df
Revert "Plz work now"
Reflexe 18e1cc5
Revert "I hope it will work now."
Reflexe 4141566
Revert "Try to support CircleCI windows artifacts."
Reflexe 4eaa014
Revert "CircleCI: Upload Win{32,64} artifacts."
Reflexe 2823a7f
MemoryManager: Add == and != operators for MmAllocator.
Reflexe 0e379d9
Recording: Don't apply masterGain for input frames.
Reflexe e79c3af
SampleTCO -> recording: Export is_record attribute for future loading.
Reflexe 634ba3b
SampleBuffer: fix resampleing error: null output data.
Reflexe 2adea81
SamplePlayHandle: Automaticlly create the handle's audio port instead of
Reflexe d732738
Cleanup for next commit: Remove the unused AudioSampleRecorder.
Reflexe fd59a0e
SampleBuffer: Remove the god function "update" and split it into a
Reflexe cf3c16e
Mixer: Fix another crash with play handle without an audioPort.
Reflexe 1e8afe6
SampleRecordHandle: Tell mixer to remove us when we done. With
Reflexe 7ad8c62
SampleBuffer: Fix a few issues caused by
Reflexe 4f7f0dd
AudioPortAudio: Support recording.
Reflexe 77b3cd1
AudioFileProcessor: Fix reversing regression that was caused by a
Reflexe de092ec
SampleTrack -> Minor: What is channnnel?
Reflexe cb6b461
SampleTrack: Move per-track slots from SampleTCO to SampleTrack.
Reflexe b26dc38
Song -> Recording with loop: support creating of recording tcos in
Reflexe b968baf
SampleRecordHandle: Fix a bug when even when not recording, a track set
Reflexe 2ff6db7
SampleBuffer -> Files: Pass the right path to changeAudioFile.
Reflexe 3a3be2c
SampleBuffer: Don't always unlock the mixer in resetData.
Reflexe c75a167
SampleBuffer -> Samplerate - Fix two sample rate issues:
Reflexe 03dc34e
SamplePlayHandle: amend previous commit: sampleRate instead of
Reflexe 68da7d8
LmmsBasics: Use a custom storage class for a frame (instead of
Reflexe 79b4041
AudioJack -> Recording -> Performence: Use `std::vector::resize` instead
Reflexe a170cb9
AudioFileProcessorView: Initialize m_reversed.
Reflexe 84a1f35
SampleBuffer: A few changes
Reflexe 1e1f038
SampleBuffer: Don't normalize any SampleBuffer's sample rate to the
Reflexe 77900c9
Windows -> Recording: Enable jack.
Reflexe feff6a2
CMake Build -> Weak Jack: Don't try to find jack libraries if we use
Reflexe 0f3fc07
LmmsBasics: Revert 68da7d8d46da860f3ec2e9ca169c46ca07a218f4 and add
Reflexe 56fd51c
Travis: Install jack on win32 builds for its headers.
Reflexe 825df24
Travis -> Jack: jack -> libjack-dev on win32.
Reflexe 854b8eb
Revert "CMake Build -> Weak Jack: Don't try to find jack libraries if we
Reflexe c40d9fd
EffectSelectDialog: Fix error with clang.
Reflexe 032a558
Song: Fix loops and recording.
Reflexe 756d8db
Revert "EffectSelectDialog: Fix error with clang."
Reflexe c70c842
Win32 Installer -> Jack: Try to bundle jack installer.
Reflexe b5288ed
Minor -> CMake: Style changes.
Reflexe baeb0ec
Minor change in previous commit
Reflexe bc1c8c7
Support Jack on Windows + Bundled jack Installer (#6)
Reflexe 4992f3b
Merge branch 'master' of https://github.com/LMMS/lmms
Reflexe 2febe3c
Merge branch 'master' of github.com:Reflexe/lmms
Reflexe 33ecc9d
SampleBuffer: Use `resetData` instead of `beginBufferChange` when
Reflexe 686263e
SampleBuffer: Make `frames()` thread-safe.
Reflexe ce5eb19
SampleBuffer & SampleTCOView: Cache visualization while recording.
Reflexe cd3699d
PulseAudio: Disable recording since it produces voices from hell.
Reflexe c68f847
AudioSdl: Disable recording in linux since it have a very high latency
Reflexe 30494c9
AudioFileProcessor: Apply changes that has been made to SampleBuffer.
Reflexe 1e75cbe
Merge branch 'master' of https://github.com/LMMS/lmms
Reflexe a2eb78a
SampleTrack: Avoid crashes while recording by locking the mixer before
Reflexe ceabe0c
SampleTrackView: Fix visualization not being cleared between recording
Reflexe c041d43
SamplePlayHandle: Fix export issues by correctly calculating
Reflexe 52661d7
SampleTCOView: Implement caching for visualization.
Reflexe 5ee299a
SampleTCO -> Recording: Block resize and move actions while recording.
Reflexe af1820f
SampleTrack: Remove invalid assert.
Reflexe 0fb6317
Song -> Recording: Handle loop points correctly.
Reflexe ee548c5
SampleBufferVisualizer: Avoid using Q_FALLTHROUGH when it is undefined.
Reflexe 6b69b79
SampleBuffer: Fix a error with not-stereo files not being loaded.
Reflexe d2f739d
SampleBuffer -> SoundFile: Support mono files, show a warning for
Reflexe 314ab17
Song -> Loops -> Recording: Make sure we're recording before emit-ing
Reflexe a415433
SampleBuffer -> Recording: Use less blocking locks with addData and
Reflexe File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -323,6 +323,8 @@ public slots: | |
|
||
void addBBTrack(); | ||
|
||
signals: | ||
void beforeRecord (); | ||
|
||
private slots: | ||
void insertBar(); | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
You should put a space after and before
=
.