mirror of
https://github.com/RGBCube/serenity
synced 2025-07-27 13:57:35 +00:00
LibAudio: Rename ConnectionFromClient to ConnectionToServer
The automatic nomenclature change for IPC sockets got this one wrong.
This commit is contained in:
parent
70846d701c
commit
3f59356c79
17 changed files with 47 additions and 47 deletions
|
@ -10,7 +10,7 @@
|
|||
#include "TrackManager.h"
|
||||
#include <AK/FixedArray.h>
|
||||
#include <AK/NumericLimits.h>
|
||||
#include <LibAudio/ConnectionFromClient.h>
|
||||
#include <LibAudio/ConnectionToServer.h>
|
||||
#include <LibAudio/Resampler.h>
|
||||
#include <LibAudio/Sample.h>
|
||||
#include <LibCore/EventLoop.h>
|
||||
|
@ -29,7 +29,7 @@ AudioPlayerLoop::AudioPlayerLoop(TrackManager& track_manager, bool& need_to_writ
|
|||
, m_need_to_write_wav(need_to_write_wav)
|
||||
, m_wav_writer(wav_writer)
|
||||
{
|
||||
m_audio_client = Audio::ConnectionFromClient::try_create().release_value_but_fixme_should_propagate_errors();
|
||||
m_audio_client = Audio::ConnectionToServer::try_create().release_value_but_fixme_should_propagate_errors();
|
||||
|
||||
auto target_sample_rate = m_audio_client->get_sample_rate();
|
||||
if (target_sample_rate == 0)
|
||||
|
|
|
@ -8,7 +8,7 @@
|
|||
#pragma once
|
||||
|
||||
#include "Music.h"
|
||||
#include <LibAudio/ConnectionFromClient.h>
|
||||
#include <LibAudio/ConnectionToServer.h>
|
||||
#include <LibAudio/Resampler.h>
|
||||
#include <LibAudio/Sample.h>
|
||||
#include <LibAudio/WavWriter.h>
|
||||
|
@ -35,7 +35,7 @@ private:
|
|||
TrackManager& m_track_manager;
|
||||
Array<Sample, sample_count> m_buffer;
|
||||
Optional<Audio::ResampleHelper<Sample>> m_resampler;
|
||||
RefPtr<Audio::ConnectionFromClient> m_audio_client;
|
||||
RefPtr<Audio::ConnectionToServer> m_audio_client;
|
||||
|
||||
bool m_should_play_audio = true;
|
||||
|
||||
|
|
|
@ -11,7 +11,7 @@
|
|||
#include "MainWidget.h"
|
||||
#include "TrackManager.h"
|
||||
#include <AK/Queue.h>
|
||||
#include <LibAudio/ConnectionFromClient.h>
|
||||
#include <LibAudio/ConnectionToServer.h>
|
||||
#include <LibAudio/WavWriter.h>
|
||||
#include <LibCore/EventLoop.h>
|
||||
#include <LibCore/System.h>
|
||||
|
|
|
@ -7,7 +7,7 @@
|
|||
|
||||
#include "PlaybackManager.h"
|
||||
|
||||
PlaybackManager::PlaybackManager(NonnullRefPtr<Audio::ConnectionFromClient> connection)
|
||||
PlaybackManager::PlaybackManager(NonnullRefPtr<Audio::ConnectionToServer> connection)
|
||||
: m_connection(connection)
|
||||
{
|
||||
// FIXME: The buffer enqueuing should happen on a wholly independent second thread.
|
||||
|
|
|
@ -10,7 +10,7 @@
|
|||
#include <AK/FixedArray.h>
|
||||
#include <AK/Queue.h>
|
||||
#include <AK/Vector.h>
|
||||
#include <LibAudio/ConnectionFromClient.h>
|
||||
#include <LibAudio/ConnectionToServer.h>
|
||||
#include <LibAudio/Loader.h>
|
||||
#include <LibAudio/Resampler.h>
|
||||
#include <LibAudio/Sample.h>
|
||||
|
@ -18,7 +18,7 @@
|
|||
|
||||
class PlaybackManager final {
|
||||
public:
|
||||
PlaybackManager(NonnullRefPtr<Audio::ConnectionFromClient>);
|
||||
PlaybackManager(NonnullRefPtr<Audio::ConnectionToServer>);
|
||||
~PlaybackManager() = default;
|
||||
|
||||
void play();
|
||||
|
@ -36,7 +36,7 @@ public:
|
|||
float total_length() const { return m_total_length; }
|
||||
FixedArray<Audio::Sample> const& current_buffer() const { return m_current_buffer; }
|
||||
|
||||
NonnullRefPtr<Audio::ConnectionFromClient> connection() const { return m_connection; }
|
||||
NonnullRefPtr<Audio::ConnectionToServer> connection() const { return m_connection; }
|
||||
|
||||
Function<void()> on_update;
|
||||
Function<void()> on_finished_playing;
|
||||
|
@ -56,7 +56,7 @@ private:
|
|||
size_t m_device_samples_per_buffer { 0 };
|
||||
size_t m_samples_to_load_per_buffer { 0 };
|
||||
RefPtr<Audio::Loader> m_loader { nullptr };
|
||||
NonnullRefPtr<Audio::ConnectionFromClient> m_connection;
|
||||
NonnullRefPtr<Audio::ConnectionToServer> m_connection;
|
||||
FixedArray<Audio::Sample> m_current_buffer;
|
||||
Optional<Audio::ResampleHelper<Audio::Sample>> m_resampler;
|
||||
RefPtr<Core::Timer> m_timer;
|
||||
|
|
|
@ -7,7 +7,7 @@
|
|||
|
||||
#include "Player.h"
|
||||
|
||||
Player::Player(Audio::ConnectionFromClient& audio_client_connection)
|
||||
Player::Player(Audio::ConnectionToServer& audio_client_connection)
|
||||
: m_audio_client_connection(audio_client_connection)
|
||||
, m_playback_manager(audio_client_connection)
|
||||
{
|
||||
|
|
|
@ -31,7 +31,7 @@ public:
|
|||
Shuffling,
|
||||
};
|
||||
|
||||
explicit Player(Audio::ConnectionFromClient& audio_client_connection);
|
||||
explicit Player(Audio::ConnectionToServer& audio_client_connection);
|
||||
virtual ~Player() = default;
|
||||
|
||||
void play_file_path(String const& path);
|
||||
|
@ -91,7 +91,7 @@ private:
|
|||
LoopMode m_loop_mode { LoopMode::None };
|
||||
ShuffleMode m_shuffle_mode { ShuffleMode::None };
|
||||
|
||||
Audio::ConnectionFromClient& m_audio_client_connection;
|
||||
Audio::ConnectionToServer& m_audio_client_connection;
|
||||
PlaybackManager m_playback_manager;
|
||||
|
||||
String m_loaded_filename;
|
||||
|
|
|
@ -24,7 +24,7 @@
|
|||
#include <LibGUI/Window.h>
|
||||
#include <LibGfx/Bitmap.h>
|
||||
|
||||
SoundPlayerWidgetAdvancedView::SoundPlayerWidgetAdvancedView(GUI::Window& window, Audio::ConnectionFromClient& connection)
|
||||
SoundPlayerWidgetAdvancedView::SoundPlayerWidgetAdvancedView(GUI::Window& window, Audio::ConnectionToServer& connection)
|
||||
: Player(connection)
|
||||
, m_window(window)
|
||||
{
|
||||
|
|
|
@ -13,7 +13,7 @@
|
|||
#include "VisualizationWidget.h"
|
||||
#include <AK/FixedArray.h>
|
||||
#include <AK/NonnullRefPtr.h>
|
||||
#include <LibAudio/ConnectionFromClient.h>
|
||||
#include <LibAudio/ConnectionToServer.h>
|
||||
#include <LibGUI/Splitter.h>
|
||||
#include <LibGUI/Widget.h>
|
||||
|
||||
|
@ -53,7 +53,7 @@ protected:
|
|||
void keydown_event(GUI::KeyEvent&) override;
|
||||
|
||||
private:
|
||||
SoundPlayerWidgetAdvancedView(GUI::Window&, Audio::ConnectionFromClient&);
|
||||
SoundPlayerWidgetAdvancedView(GUI::Window&, Audio::ConnectionToServer&);
|
||||
|
||||
void sync_previous_next_actions();
|
||||
|
||||
|
|
|
@ -10,7 +10,7 @@
|
|||
#include "Player.h"
|
||||
#include "SampleWidget.h"
|
||||
#include "SoundPlayerWidgetAdvancedView.h"
|
||||
#include <LibAudio/ConnectionFromClient.h>
|
||||
#include <LibAudio/ConnectionToServer.h>
|
||||
#include <LibCore/System.h>
|
||||
#include <LibGUI/Action.h>
|
||||
#include <LibGUI/ActionGroup.h>
|
||||
|
@ -28,7 +28,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
|
|||
TRY(Core::System::pledge("stdio recvfd sendfd rpath thread unix"));
|
||||
|
||||
auto app = TRY(GUI::Application::try_create(arguments));
|
||||
auto audio_client = TRY(Audio::ConnectionFromClient::try_create());
|
||||
auto audio_client = TRY(Audio::ConnectionToServer::try_create());
|
||||
|
||||
TRY(Core::System::pledge("stdio recvfd sendfd rpath thread"));
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue