修复master_track音量指示不正确
重命名arona_application更新函数
This commit is contained in:
parent
c0ffd07f45
commit
daab64852a
@ -38,7 +38,7 @@ void arona_application::init() {
|
||||
screen_refresh_rate_ = 60;
|
||||
}
|
||||
spdlog::info("Screen refresh rate: {} Hz", screen_refresh_rate_);
|
||||
timer_ = Glib::signal_idle().connect(sigc::mem_fun(*this, &arona_application::update_window_manager));
|
||||
timer_ = Glib::signal_idle().connect(sigc::mem_fun(*this, &arona_application::update_application));
|
||||
// timer_ = Glib::signal_timeout().connect(&update_window_manager, 0);
|
||||
}
|
||||
|
||||
|
@ -1,5 +1,7 @@
|
||||
#include "w_audio_buffer_bar.h"
|
||||
|
||||
#include <utility>
|
||||
|
||||
#include "arona_application.h"
|
||||
#include "audio/device/audio_device_manager.h"
|
||||
#include "tool/delta_timer.h"
|
||||
@ -9,8 +11,8 @@ w_audio_buffer_bar::w_audio_buffer_bar() {
|
||||
}
|
||||
|
||||
void w_audio_buffer_bar::set_buffers(weak_buffer in_buffers) {
|
||||
buffers = in_buffers;
|
||||
ref_buffer ref_buf = *buffers.lock().get();
|
||||
buffers = std::move(in_buffers);
|
||||
ref_buffer ref_buf = *buffers.lock();
|
||||
|
||||
for (auto& buffer : ref_buf) {
|
||||
buffer.PushZeros(buffer.GetCapacity());
|
||||
@ -36,7 +38,7 @@ void w_audio_buffer_bar::on_timer(double delta_time) {
|
||||
if (buffers.expired()) {
|
||||
return;
|
||||
}
|
||||
ref_buffer ref_buf = *buffers.lock().get();
|
||||
ref_buffer ref_buf = *buffers.lock();
|
||||
|
||||
const uint32_t sample_rate = get_audio_device_manager()->get_sample_rate();
|
||||
const auto delta_samples = static_cast<uint32_t>(delta_time * sample_rate);
|
||||
|
@ -2,12 +2,17 @@
|
||||
|
||||
#include "w_mixer_track.h"
|
||||
#include "audio/mixer/mixer.h"
|
||||
#include "thread_message/thread_message_hubs.h"
|
||||
|
||||
w_mixer_list::w_mixer_list() {
|
||||
mixer* mixer = get_mixer();
|
||||
dummy_track* master_track = mixer->get_master();
|
||||
master_track_ = Gtk::make_managed<w_mixer_track>();
|
||||
master_track_->set_mixer_track(master_track);
|
||||
|
||||
{
|
||||
dummy_track *master_track = get_mixer()->get_master();
|
||||
master_track_ = Gtk::make_managed<w_mixer_track>();
|
||||
master_track_->set_mixer_track(master_track);
|
||||
append(*master_track_);
|
||||
}
|
||||
|
||||
mixer->on_add_track.add_raw(this, &w_mixer_list::on_add_track);
|
||||
mixer->on_remove_track.add_raw(this, &w_mixer_list::on_remove_track);
|
||||
@ -24,7 +29,6 @@ w_mixer_list::w_mixer_list() {
|
||||
list_view_.set_factory(factory_);
|
||||
list_view_.set_orientation(Gtk::Orientation::HORIZONTAL);
|
||||
|
||||
append(*master_track_);
|
||||
append(list_view_);
|
||||
}
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user