-
-
Notifications
You must be signed in to change notification settings - Fork 1.1k
Merge stable-1.2
into master
#3607
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
Conversation
Add 2017 kicker competition winner to demo projects.
… SF2 plugin directory when running LMMS from build directory without install. (LMMS#3502)
* Dual Filter * Design Tweaks
The Delay plugin had an issue with the delay knob having the incorrect max value, this was resulting in incorrectly scaled times This has been corrected.
This reverts commit e4474af.
EQ plugin now responds to wet / dry control
Correct the Delay syncronisation
Disable HiDPI on Windows
m_bufferLastUpdated is now correctly set to the current frame upon updating the buffer.
LFO controller now has correct frequency with multiple connections.
Add a new value of "24 Bit Float" to the "Depth" combo box in the project export dialog. Add a new enum value to ProjectRenderer::Depth and extend the evaluation of the different enum values in ProjectRenderer. Add the new case of a depth of 24 to AudioFileWave and remove some repetition with regards to SF_FORMAT_WAV in the code. It's only set once now and then the depth is "added" in a switch statement.
Pull the class OutputSettings out of the class ProjectRenderer so that it can be used in other contexts as well. Also move the enum ProjectRenderer::Depth into the new class OutputSettings and rename it to BitDepth. Adjust all places that referenced ProjectRenderer::OutputSettings accordingly. Adjust the two places where an instance of OutputSettings is created: the main function and ExportProjectDialog::startExport. Store an instance of OutputSettings in AudioFileDevice and remove several members and methods which are now replaced by this instance. Add a getter for the OutputSettings to AudioFileDevice. Storing an instance of OutputSettings in the base class AudioFileDevice enables the simplification of the following constructors and general code in the following classes: * AudioFileDevice * AudioFileOgg * AudioFileWave Because OutputSettings contains everything related to sample rate, bit rate settings and bit depth these parameters could be removed from the parameter list of the aforementioned constructors. Simplify the signature of the factory method AudioFileDeviceInstantiaton (defined in AudioFileDevice.h) and reorder the parameters by significance. Move the logic of how the minimum and maximum bitrate is calculated using the nominal bitrate into AudioFileOgg::minBitrate() and AudioFileOgg::maxBitrate(). Previously this was defined in the constructor of ProjectRenderer where it does not belong as it an implementation detail of the OGG export. Remove the code that converted the bit depth enum to an integer from ProjectRenderer as it is now solely represented as an enum. Remove class members for the minimum and maximum bit rate from AudioFileOgg and adjust the code in the implementation to use the values stored in OutputSettings.
Only show widgets on the export dialog that are relevant to the selected file format (Wave/Ogg): * Sample rate is always shown. * Bit depth settings are only shown when Wave is selected. * Bit rate settings are only shown when Ogg is selected. Remove the label that informs the user that not all settings apply to all export formats as it is not needed anymore. The english text of that label was: "Please note that not all of the parameters above apply for all file formats."
If the variables bit rate is not enabled the nominal bit rate will be used for the minimum and maximum bit rate in the encoder. If the variable bit rate is enabled the current implementation will compute the minimum bitrate by subtracting 64 kBit/s from the nominal bit rate. The maximum bit rate is computed by adding 64 kBit/s to it. Example: The nominal bit rate is set to 160 kBit/s and variable bit rate is enabled in the export dialog. The minimum bit rate is then set to 96 kBit/s and the maximum bit rate to 224 kBit/s.
…-For-1.2 24 Bit WAV export, variable bit rate Ogg and export dialog improvements
Provide support for fallback config values Makes autosave and some other values checked by default. Supersedes LMMS#3541
* ReverbSC: Method to change samplerate (LMMS#3401) * ReverbSC: added mutex for protected malloc * ReverbSC: small CMake fix to remove warning message * ReverbSC: samplerate changed to uint32_t. more CMakeFile tweaks * Fix dc block on oversampling
This is where we want new users directed to.
The previous delay code was incorrectly not utalising the whole buffer, causing glitches when incressing the delay time, due to outputting incorrect data, This was apparent when using the lfo in the Delay and Flanger plugins. This has been rectified. The read index is now offset from the write index. and the complete buffer is used in a circular fashon. Flanger - resolved issue where the lfo could create negative delay lengths
The LFO rate was not correctly syncronising to tempo This has been rectifited, to utalise the TempoSyncKnob as intended, returning a period, instead of a frequency. The knob now reports the correct values in the GUI. Flanger LFO maximum period incressed to 60 seconds
@PhysSong what's the issue still? There were only 4 conflicting files in this merge:
Instead creating new PR and starting everyting over the remaining conflict should be resolved here. |
@liushuyu Could you tell me how did you make and add commits? |
Do you want to rework the merge and start everything from the ground up or just fix mine? The procedures can be different |
@tresf Which merge method should be used? If I know that, I'll check and do some tests with it. |
I personally recommend regular 3 way |
This isn't my area of expertise. Please feel free to try a few things out. |
I tried both
gave me the best result. |
PhysSong Which branch did you take as base branch? It should be |
And @PhysSong please use |
@liushuyu Yes. As I know, any of these methods doesn't generate correct and clean commit histories(unless someone force-push commits into master - definitely not good). |
3860f68
to
a76e5b3
Compare
Problem solved. |
Ah. Okay, so you think it's very vital to include those changes as well? Let's just merge it earlier if there's no other problems that affect the actual functionality to avoid merge the **** over and over and over and over again |
@liushuyu Okay. Merging it now and editing those lines later would be better. Now it seems to be fine. |
Manually push my branch directly to |
That looks very clean. I'm leaving the merging up to you guys though, I hope that's OK. |
This change is