forked from SerenityOS/serenity
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
This commit adds basic support for importing, viewing and playing WAV samples at different pitches. Naming issues: - We are using the Sample struct from Music.h, but also the Sample struct from LibAudio (Audio::Sample). This is a little confusing. set_recorded_sample() finds the peak sample and then divides all the samples by that peak to get a guaranteed min/max of -1/1. This is nice because our other waves are also bound between these values and we can just do the same stuff. This is why we're using Audio::Sample, because it uses floats, whereas Music.h's Sample uses i16s. It's a little annoying that we have to use a mixture of floats and doubles though. For playback at lower frequencies, we're calculating in-between samples, rather than just playing samples multiple times. Basically, you get the current sample and add the difference between the current sample and the next sample multiplied by the distance from the current sample. This is like drawing the hypotenuse of a right-angled triangle.
- Loading branch information
1 parent
591870c
commit 9997b0d
Showing
9 changed files
with
317 additions
and
35 deletions.
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,133 @@ | ||
| /* | ||
| * Copyright (c) 2020-2020, William McPherson <[email protected]> | ||
| * All rights reserved. | ||
| * | ||
| * Redistribution and use in source and binary forms, with or without | ||
| * modification, are permitted provided that the following conditions are met: | ||
| * | ||
| * 1. Redistributions of source code must retain the above copyright notice, this | ||
| * list of conditions and the following disclaimer. | ||
| * | ||
| * 2. Redistributions in binary form must reproduce the above copyright notice, | ||
| * this list of conditions and the following disclaimer in the documentation | ||
| * and/or other materials provided with the distribution. | ||
| * | ||
| * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" | ||
| * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | ||
| * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | ||
| * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE | ||
| * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL | ||
| * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR | ||
| * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER | ||
| * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, | ||
| * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | ||
| * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
| */ | ||
|
|
||
| #include "SamplerWidget.h" | ||
| #include "AudioEngine.h" | ||
| #include <LibGUI/BoxLayout.h> | ||
| #include <LibGUI/Button.h> | ||
| #include <LibGUI/FilePicker.h> | ||
| #include <LibGUI/Label.h> | ||
| #include <LibGUI/MessageBox.h> | ||
| #include <LibGUI/Painter.h> | ||
|
|
||
| WaveEditor::WaveEditor(GUI::Widget* parent, AudioEngine& audio_engine) | ||
| : GUI::Frame(parent) | ||
| , m_audio_engine(audio_engine) | ||
| { | ||
| set_frame_thickness(2); | ||
| set_frame_shadow(Gfx::FrameShadow::Sunken); | ||
| set_frame_shape(Gfx::FrameShape::Container); | ||
| } | ||
|
|
||
| WaveEditor::~WaveEditor() | ||
| { | ||
| } | ||
|
|
||
| int WaveEditor::sample_to_y(float percentage) const | ||
| { | ||
| double portion_of_half_height = percentage * ((frame_inner_rect().height() - 1) / 2.0); | ||
| double y = (frame_inner_rect().height() / 2.0) + portion_of_half_height; | ||
| return y; | ||
| } | ||
|
|
||
| void WaveEditor::paint_event(GUI::PaintEvent& event) | ||
| { | ||
| GUI::Frame::paint_event(event); | ||
|
|
||
| GUI::Painter painter(*this); | ||
| painter.fill_rect(frame_inner_rect(), Color::Black); | ||
|
|
||
| auto recorded_sample = m_audio_engine.recorded_sample(); | ||
| if (recorded_sample.is_empty()) | ||
| return; | ||
|
|
||
| double width_scale = static_cast<double>(frame_inner_rect().width()) / recorded_sample.size(); | ||
|
|
||
| painter.translate(frame_thickness(), frame_thickness()); | ||
|
|
||
| int prev_x = 0; | ||
| int prev_y = sample_to_y(recorded_sample[0].left); | ||
| painter.set_pixel({ prev_x, prev_y }, wave_colors[RecordedSample]); | ||
|
|
||
| for (int x = 1; x < recorded_sample.size(); ++x) { | ||
| int y = sample_to_y(recorded_sample[x].left); | ||
|
|
||
| Gfx::Point point1(prev_x * width_scale, prev_y); | ||
| Gfx::Point point2(x * width_scale, y); | ||
| painter.draw_line(point1, point2, wave_colors[RecordedSample]); | ||
|
|
||
| prev_x = x; | ||
| prev_y = y; | ||
| } | ||
| } | ||
|
|
||
| SamplerWidget::SamplerWidget(GUI::Widget* parent, AudioEngine& audio_engine) | ||
| : GUI::Frame(parent) | ||
| , m_audio_engine(audio_engine) | ||
| { | ||
| set_frame_thickness(2); | ||
| set_frame_shadow(Gfx::FrameShadow::Sunken); | ||
| set_frame_shape(Gfx::FrameShape::Container); | ||
| set_layout(make<GUI::VerticalBoxLayout>()); | ||
| layout()->set_margins({ 10, 10, 10, 10 }); | ||
| layout()->set_spacing(10); | ||
| set_fill_with_background_color(true); | ||
|
|
||
| m_open_button_and_recorded_sample_name_container = GUI::Widget::construct(this); | ||
| m_open_button_and_recorded_sample_name_container->set_layout(make<GUI::HorizontalBoxLayout>()); | ||
| m_open_button_and_recorded_sample_name_container->layout()->set_spacing(10); | ||
| m_open_button_and_recorded_sample_name_container->set_size_policy(GUI::SizePolicy::Fill, GUI::SizePolicy::Fixed); | ||
| m_open_button_and_recorded_sample_name_container->set_preferred_size(0, 24); | ||
|
|
||
| m_open_button = GUI::Button::construct(m_open_button_and_recorded_sample_name_container); | ||
| m_open_button->set_size_policy(GUI::SizePolicy::Fixed, GUI::SizePolicy::Fixed); | ||
| m_open_button->set_preferred_size(24, 24); | ||
| m_open_button->set_focusable(false); | ||
| m_open_button->set_icon(Gfx::Bitmap::load_from_file("/res/icons/16x16/open.png")); | ||
| m_open_button->on_click = [this](const auto&) { | ||
| Optional<String> open_path = GUI::FilePicker::get_open_filepath(); | ||
| if (!open_path.has_value()) | ||
| return; | ||
| String error_string = m_audio_engine.set_recorded_sample(open_path.value()); | ||
| if (!error_string.is_empty()) { | ||
| GUI::MessageBox::show(String::format("Failed to load WAV file: %s", error_string.characters()), "Error", GUI::MessageBox::Type::Error); | ||
| return; | ||
| } | ||
| m_recorded_sample_name->set_text(open_path.value()); | ||
| m_wave_editor->update(); | ||
| }; | ||
|
|
||
| m_recorded_sample_name = GUI::Label::construct("No sample loaded", m_open_button_and_recorded_sample_name_container); | ||
| m_recorded_sample_name->set_text_alignment(Gfx::TextAlignment::CenterLeft); | ||
|
|
||
| m_wave_editor = WaveEditor::construct(this, m_audio_engine); | ||
| m_wave_editor->set_size_policy(GUI::SizePolicy::Fill, GUI::SizePolicy::Fixed); | ||
| m_wave_editor->set_preferred_size(0, 100); | ||
| } | ||
|
|
||
| SamplerWidget::~SamplerWidget() | ||
| { | ||
| } |
Oops, something went wrong.