From 6fc4c8da143fbab33a0db505668e50051c27442f Mon Sep 17 00:00:00 2001 From: Thomas Goyne Date: Wed, 23 Apr 2014 13:53:24 -0700 Subject: [PATCH] Move make_unique to its own header file Rebuilding the entire project after touching util.h gets old fast. --- build/libaegisub/libaegisub.vcxproj | 1 + build/libaegisub/libaegisub.vcxproj.filters | 3 + libaegisub/common/file_mapping.cpp | 3 +- libaegisub/common/io.cpp | 5 +- libaegisub/common/json.cpp | 2 +- libaegisub/common/option_visit.cpp | 14 ++-- libaegisub/common/path.cpp | 2 +- libaegisub/common/thesaurus.cpp | 4 +- libaegisub/include/libaegisub/make_unique.h | 24 +++++++ libaegisub/include/libaegisub/util.h | 5 -- libaegisub/unix/log.cpp | 2 +- libaegisub/unix/util.cpp | 2 +- libaegisub/windows/log_win.cpp | 2 +- libaegisub/windows/path_win.cpp | 2 +- src/ass_dialogue.cpp | 12 ++-- src/ass_override.cpp | 4 +- src/ass_parser.cpp | 6 +- src/ass_style_storage.cpp | 4 +- src/audio_display.cpp | 14 ++-- src/audio_karaoke.cpp | 4 +- src/audio_marker.cpp | 8 +-- src/audio_player_alsa.cpp | 4 +- src/audio_player_dsound.cpp | 4 +- src/audio_player_dsound2.cpp | 6 +- src/audio_player_openal.cpp | 4 +- src/audio_player_oss.cpp | 4 +- src/audio_player_portaudio.cpp | 4 +- src/audio_player_pulse.cpp | 4 +- src/audio_provider.cpp | 2 +- src/audio_provider_avs.cpp | 4 +- src/audio_provider_convert.cpp | 14 ++-- src/audio_provider_dummy.cpp | 4 +- src/audio_provider_ffmpegsource.cpp | 4 +- src/audio_provider_hd.cpp | 6 +- src/audio_provider_lock.cpp | 4 +- src/audio_provider_pcm.cpp | 8 +-- src/audio_provider_ram.cpp | 4 +- src/audio_renderer.cpp | 4 +- src/audio_renderer_spectrum.cpp | 4 +- src/audio_timing_dialogue.cpp | 4 +- src/audio_timing_karaoke.cpp | 4 +- src/auto4_base.cpp | 4 +- src/auto4_lua.cpp | 8 +-- src/auto4_lua_assfile.cpp | 6 +- src/auto4_lua_dialog.cpp | 22 +++--- src/command/app.cpp | 28 ++++---- src/command/audio.cpp | 64 ++++++++--------- src/command/automation.cpp | 10 +-- src/command/edit.cpp | 66 +++++++++--------- src/command/grid.cpp | 46 ++++++------ src/command/help.cpp | 14 ++-- src/command/keyframe.cpp | 8 +-- src/command/recent.cpp | 22 +++--- src/command/subtitle.cpp | 38 +++++----- src/command/time.cpp | 38 +++++----- src/command/timecode.cpp | 8 +-- src/command/tool.cpp | 36 +++++----- src/command/video.cpp | 77 +++++++++++---------- src/command/vis_tool.cpp | 18 ++--- src/context.cpp | 22 +++--- src/crash_writer_minidump.cpp | 3 +- src/dialog_colorpicker.cpp | 4 +- src/dialog_detached_video.cpp | 4 +- src/dialog_export.cpp | 4 +- src/dialog_export_ebu3264.cpp | 16 ++--- src/dialog_fonts_collector.cpp | 6 +- src/dialog_search_replace.cpp | 4 +- src/dialog_shift_times.cpp | 4 +- src/dialog_style_editor.cpp | 6 +- src/dialog_style_manager.cpp | 8 +-- src/dialog_styling_assistant.cpp | 4 +- src/dialog_translation.cpp | 4 +- src/font_file_lister_fontconfig.cpp | 2 +- src/frame_main.cpp | 3 +- src/grid_column.h | 4 +- src/hotkey_data_view_model.cpp | 4 +- src/main.cpp | 11 +-- src/menu.cpp | 6 +- src/preferences_base.cpp | 4 +- src/spellchecker.cpp | 4 +- src/spellchecker_hunspell.cpp | 8 +-- src/subs_edit_ctrl.cpp | 6 +- src/subs_preview.cpp | 12 ++-- src/subtitle_format.cpp | 20 +++--- src/subtitles_provider_csri.cpp | 4 +- src/subtitles_provider_libass.cpp | 3 +- src/text_file_reader.cpp | 6 +- src/text_file_writer.cpp | 4 +- src/thesaurus.cpp | 4 +- src/toolbar.cpp | 2 +- src/video_context.cpp | 4 +- src/video_display.cpp | 8 +-- src/video_provider_avs.cpp | 4 +- src/video_provider_cache.cpp | 4 +- src/video_provider_dummy.cpp | 3 +- src/video_provider_ffmpegsource.cpp | 4 +- src/video_provider_manager.cpp | 2 +- src/video_provider_yuv4mpeg.cpp | 3 +- src/visual_tool_cross.cpp | 4 +- src/visual_tool_drag.cpp | 8 +-- src/visual_tool_vector_clip.cpp | 8 +-- 101 files changed, 506 insertions(+), 474 deletions(-) create mode 100644 libaegisub/include/libaegisub/make_unique.h diff --git a/build/libaegisub/libaegisub.vcxproj b/build/libaegisub/libaegisub.vcxproj index 030a8eda8..b34e4bb01 100644 --- a/build/libaegisub/libaegisub.vcxproj +++ b/build/libaegisub/libaegisub.vcxproj @@ -65,6 +65,7 @@ + diff --git a/build/libaegisub/libaegisub.vcxproj.filters b/build/libaegisub/libaegisub.vcxproj.filters index 9af2f8403..de010829d 100644 --- a/build/libaegisub/libaegisub.vcxproj.filters +++ b/build/libaegisub/libaegisub.vcxproj.filters @@ -170,6 +170,9 @@ Header Files + + Header Files + diff --git a/libaegisub/common/file_mapping.cpp b/libaegisub/common/file_mapping.cpp index 4bedf9a7a..5401564f0 100644 --- a/libaegisub/common/file_mapping.cpp +++ b/libaegisub/common/file_mapping.cpp @@ -17,6 +17,7 @@ #include "libaegisub/file_mapping.h" #include "libaegisub/fs.h" +#include "libaegisub/make_unique.h" #include "libaegisub/util.h" #include @@ -58,7 +59,7 @@ char *map(int64_t s_offset, uint64_t length, boost::interprocess::mode_t mode, throw std::bad_alloc(); try { - region = agi::util::make_unique(file, mode, mapping_start, static_cast(length)); + region = agi::make_unique(file, mode, mapping_start, static_cast(length)); } catch (interprocess_exception const&) { throw agi::fs::FileSystemUnknownError("Failed mapping a view of the file"); diff --git a/libaegisub/common/io.cpp b/libaegisub/common/io.cpp index aa7217aa5..0892b0f44 100644 --- a/libaegisub/common/io.cpp +++ b/libaegisub/common/io.cpp @@ -21,6 +21,7 @@ #include #include "libaegisub/fs.h" #include "libaegisub/log.h" +#include "libaegisub/make_unique.h" #include "libaegisub/path.h" #include "libaegisub/util.h" @@ -34,7 +35,7 @@ std::unique_ptr Open(fs::path const& file, bool binary) { LOG_D("agi/io/open/file") << file; acs::CheckFileRead(file); - auto stream = util::make_unique(file, (binary ? std::ios::binary : std::ios::in)); + auto stream = agi::make_unique(file, (binary ? std::ios::binary : std::ios::in)); if (stream->fail()) throw IOFatal("Unknown fatal error as occurred"); @@ -56,7 +57,7 @@ Save::Save(fs::path const& file, bool binary) // Not an error } - fp = util::make_unique(tmp_name, binary ? std::ios::binary : std::ios::out); + fp = agi::make_unique(tmp_name, binary ? std::ios::binary : std::ios::out); if (!fp->good()) throw fs::WriteDenied(tmp_name); } diff --git a/libaegisub/common/json.cpp b/libaegisub/common/json.cpp index a1be75fbd..556498b86 100644 --- a/libaegisub/common/json.cpp +++ b/libaegisub/common/json.cpp @@ -21,7 +21,7 @@ #include "libaegisub/fs.h" #include "libaegisub/io.h" #include "libaegisub/log.h" -#include "libaegisub/util.h" +#include "libaegisub/make_unique.h" #include diff --git a/libaegisub/common/option_visit.cpp b/libaegisub/common/option_visit.cpp index ef2756e0f..825f19571 100644 --- a/libaegisub/common/option_visit.cpp +++ b/libaegisub/common/option_visit.cpp @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include @@ -75,7 +75,7 @@ std::unique_ptr ConfigVisitor::ReadArray(json::Array const& src, st arr.push_back((typename OptionValueType::value_type::value_type)(obj.begin()->second)); } - return util::make_unique(name, std::move(arr)); + return agi::make_unique(name, std::move(arr)); } void ConfigVisitor::Visit(const json::Array& array) { @@ -107,11 +107,11 @@ void ConfigVisitor::Visit(const json::Array& array) { } void ConfigVisitor::Visit(const json::Integer& number) { - AddOptionValue(util::make_unique(name, number)); + AddOptionValue(agi::make_unique(name, number)); } void ConfigVisitor::Visit(const json::Double& number) { - AddOptionValue(util::make_unique(name, number)); + AddOptionValue(agi::make_unique(name, number)); } void ConfigVisitor::Visit(const json::String& string) { @@ -121,14 +121,14 @@ void ConfigVisitor::Visit(const json::String& string) { (size >= 10 && boost::starts_with(string, "rgb(")) || ((size == 9 || size == 10) && boost::starts_with(string, "&H"))) { - AddOptionValue(util::make_unique(name, string)); + AddOptionValue(agi::make_unique(name, string)); } else { - AddOptionValue(util::make_unique(name, string)); + AddOptionValue(agi::make_unique(name, string)); } } void ConfigVisitor::Visit(const json::Boolean& boolean) { - AddOptionValue(util::make_unique(name, boolean)); + AddOptionValue(agi::make_unique(name, boolean)); } void ConfigVisitor::Visit(const json::Null& null) { diff --git a/libaegisub/common/path.cpp b/libaegisub/common/path.cpp index a710e5b60..154fc2dd3 100644 --- a/libaegisub/common/path.cpp +++ b/libaegisub/common/path.cpp @@ -21,7 +21,7 @@ #include "libaegisub/path.h" #include "libaegisub/fs.h" -#include "libaegisub/util.h" +#include "libaegisub/make_unique.h" #include #include diff --git a/libaegisub/common/thesaurus.cpp b/libaegisub/common/thesaurus.cpp index de4497f92..575e889f5 100644 --- a/libaegisub/common/thesaurus.cpp +++ b/libaegisub/common/thesaurus.cpp @@ -21,7 +21,7 @@ #include "libaegisub/charset_conv.h" #include "libaegisub/file_mapping.h" #include "libaegisub/line_iterator.h" -#include "libaegisub/util.h" +#include "libaegisub/make_unique.h" #include #include @@ -33,7 +33,7 @@ using boost::phoenix::placeholders::_1; namespace agi { Thesaurus::Thesaurus(agi::fs::path const& dat_path, agi::fs::path const& idx_path) -: dat(util::make_unique(dat_path)) +: dat(make_unique(dat_path)) { read_file_mapping idx_file(idx_path); boost::interprocess::ibufferstream idx(idx_file.read(), static_cast(idx_file.size())); diff --git a/libaegisub/include/libaegisub/make_unique.h b/libaegisub/include/libaegisub/make_unique.h new file mode 100644 index 000000000..3af862e97 --- /dev/null +++ b/libaegisub/include/libaegisub/make_unique.h @@ -0,0 +1,24 @@ +// Copyright (c) 2014, Thomas Goyne +// +// Permission to use, copy, modify, and distribute this software for any +// purpose with or without fee is hereby granted, provided that the above +// copyright notice and this permission notice appear in all copies. +// +// THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES +// WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF +// MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR +// ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES +// WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN +// ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF +// OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. +// +// Aegisub Project http://www.aegisub.org/ + +#include + +namespace agi { + template + std::unique_ptr make_unique(Args&&... args) { + return std::unique_ptr(new T(std::forward(args)...)); + } +} diff --git a/libaegisub/include/libaegisub/util.h b/libaegisub/include/libaegisub/util.h index f6589e83c..46ea888a3 100644 --- a/libaegisub/include/libaegisub/util.h +++ b/libaegisub/include/libaegisub/util.h @@ -57,11 +57,6 @@ namespace agi { /// @param name New name for the thread void SetThreadName(const char *name); - template - std::unique_ptr make_unique(Args&&... args) { - return std::unique_ptr(new T(std::forward(args)...)); - } - /// A thin wrapper around this_thread::sleep_for that uses std::thread on /// Windows (to avoid having to compile boost.thread) and boost::thread /// elsewhere (because libstcc++ 4.7 is missing it). diff --git a/libaegisub/unix/log.cpp b/libaegisub/unix/log.cpp index 7e0169af9..4840f8240 100644 --- a/libaegisub/unix/log.cpp +++ b/libaegisub/unix/log.cpp @@ -23,7 +23,7 @@ #include #include "libaegisub/log.h" -#include "libaegisub/util.h" +#include "libaegisub/make_unique.h" namespace agi { namespace log { diff --git a/libaegisub/unix/util.cpp b/libaegisub/unix/util.cpp index 99265119c..80a76a859 100644 --- a/libaegisub/unix/util.cpp +++ b/libaegisub/unix/util.cpp @@ -16,7 +16,7 @@ /// @brief Unix utility methods. /// @ingroup libaegisub unix -#include "libaegisub/util.h" +#include "libaegisub/make_unique.h" #include diff --git a/libaegisub/windows/log_win.cpp b/libaegisub/windows/log_win.cpp index 1ae66a37b..d5171e5df 100644 --- a/libaegisub/windows/log_win.cpp +++ b/libaegisub/windows/log_win.cpp @@ -23,7 +23,7 @@ #include "libaegisub/log.h" #include "libaegisub/charset_conv_win.h" -#include "libaegisub/util.h" +#include "libaegisub/make_unique.h" #define WIN32_LEAN_AND_MEAN #include diff --git a/libaegisub/windows/path_win.cpp b/libaegisub/windows/path_win.cpp index 470d7ec30..2c8fc60bd 100644 --- a/libaegisub/windows/path_win.cpp +++ b/libaegisub/windows/path_win.cpp @@ -20,7 +20,7 @@ #include -#include +#include #include diff --git a/src/ass_dialogue.cpp b/src/ass_dialogue.cpp index 38577ca75..9f578effa 100644 --- a/src/ass_dialogue.cpp +++ b/src/ass_dialogue.cpp @@ -37,7 +37,7 @@ #include #include -#include +#include #include #include @@ -171,7 +171,7 @@ std::vector> AssDialogue::ParseTags() const { // Empty line, make an empty block if (Text.get().empty()) { - Blocks.push_back(agi::util::make_unique()); + Blocks.push_back(agi::make_unique()); return Blocks; } @@ -196,11 +196,11 @@ std::vector> AssDialogue::ParseTags() const { if (work.size() && work.find('\\') == std::string::npos) { //We've found an override block with no backslashes //We're going to assume it's a comment and not consider it an override block - Blocks.push_back(agi::util::make_unique(work)); + Blocks.push_back(agi::make_unique(work)); } else { // Create block - auto block = agi::util::make_unique(work); + auto block = agi::make_unique(work); block->ParseTags(); // Look for \p in block @@ -228,9 +228,9 @@ plain: } if (drawingLevel == 0) - Blocks.push_back(agi::util::make_unique(work)); + Blocks.push_back(agi::make_unique(work)); else - Blocks.push_back(agi::util::make_unique(work, drawingLevel)); + Blocks.push_back(agi::make_unique(work, drawingLevel)); } return Blocks; diff --git a/src/ass_override.cpp b/src/ass_override.cpp index 8c4ca1a72..d64bb1c33 100644 --- a/src/ass_override.cpp +++ b/src/ass_override.cpp @@ -38,7 +38,7 @@ #include "utils.h" #include -#include +#include #include #include @@ -114,7 +114,7 @@ template<> agi::Color AssOverrideParameter::Get() const { template<> AssDialogueBlockOverride *AssOverrideParameter::Get() const { if (!block.get()) { - block = agi::util::make_unique(Get()); + block = agi::make_unique(Get()); block->ParseTags(); } return block.get(); diff --git a/src/ass_parser.cpp b/src/ass_parser.cpp index eea747dc4..7b193cce4 100644 --- a/src/ass_parser.cpp +++ b/src/ass_parser.cpp @@ -21,7 +21,7 @@ #include "ass_style.h" #include "subtitle_format.h" -#include +#include #include #include @@ -105,12 +105,12 @@ void AssParser::ParseStyleLine(std::string const& data) { void AssParser::ParseFontLine(std::string const& data) { if (boost::starts_with(data, "fontname: ")) - attach = agi::util::make_unique(data, AssEntryGroup::FONT); + attach = agi::make_unique(data, AssEntryGroup::FONT); } void AssParser::ParseGraphicsLine(std::string const& data) { if (boost::starts_with(data, "filename: ")) - attach = agi::util::make_unique(data, AssEntryGroup::GRAPHIC); + attach = agi::make_unique(data, AssEntryGroup::GRAPHIC); } void AssParser::AddLine(std::string const& data) { diff --git a/src/ass_style_storage.cpp b/src/ass_style_storage.cpp index 98d2c3cb8..1cf00a31d 100644 --- a/src/ass_style_storage.cpp +++ b/src/ass_style_storage.cpp @@ -39,7 +39,7 @@ #include #include #include -#include +#include #include @@ -67,7 +67,7 @@ void AssStyleStorage::Load(agi::fs::path const& filename) { auto in = agi::io::Open(file); for (auto const& line : agi::line_iterator(*in)) { try { - style.emplace_back(agi::util::make_unique(line)); + style.emplace_back(agi::make_unique(line)); } catch(...) { /* just ignore invalid lines for now */ } diff --git a/src/audio_display.cpp b/src/audio_display.cpp index 94cad1c74..7db9f3152 100644 --- a/src/audio_display.cpp +++ b/src/audio_display.cpp @@ -52,7 +52,7 @@ #include "utils.h" #include "video_context.h" -#include +#include #include @@ -551,10 +551,10 @@ AudioDisplay::AudioDisplay(wxWindow *parent, AudioController *controller, agi::C : wxWindow(parent, -1, wxDefaultPosition, wxDefaultSize, wxWANTS_CHARS|wxBORDER_SIMPLE) , audio_open_connection(controller->AddAudioOpenListener(&AudioDisplay::OnAudioOpen, this)) , context(context) -, audio_renderer(agi::util::make_unique()) +, audio_renderer(agi::make_unique()) , controller(controller) -, scrollbar(agi::util::make_unique(this)) -, timeline(agi::util::make_unique(this)) +, scrollbar(agi::make_unique(this)) +, timeline(agi::make_unique(this)) { style_ranges[0] = AudioStyle_Normal; @@ -722,7 +722,7 @@ void AudioDisplay::ReloadRenderingSettings() if (OPT_GET("Audio/Spectrum")->GetBool()) { colour_scheme_name = OPT_GET("Colour/Audio Display/Spectrum")->GetString(); - auto audio_spectrum_renderer = agi::util::make_unique(colour_scheme_name); + auto audio_spectrum_renderer = agi::make_unique(colour_scheme_name); int64_t spectrum_quality = OPT_GET("Audio/Renderer/Spectrum/Quality")->GetInt(); #ifdef WITH_FFTW3 @@ -744,7 +744,7 @@ void AudioDisplay::ReloadRenderingSettings() else { colour_scheme_name = OPT_GET("Colour/Audio Display/Waveform")->GetString(); - audio_renderer_provider = agi::util::make_unique(colour_scheme_name); + audio_renderer_provider = agi::make_unique(colour_scheme_name); } audio_renderer->SetRenderer(audio_renderer_provider.get()); @@ -1087,7 +1087,7 @@ void AudioDisplay::OnMouseEvent(wxMouseEvent& event) if (markers.size()) { RemoveTrackCursor(); - audio_marker = agi::util::make_unique(markers, timing, this, (wxMouseButton)event.GetButton()); + audio_marker = agi::make_unique(markers, timing, this, (wxMouseButton)event.GetButton()); SetDraggedObject(audio_marker.get()); return; } diff --git a/src/audio_karaoke.cpp b/src/audio_karaoke.cpp index b5523ed62..7879b235e 100644 --- a/src/audio_karaoke.cpp +++ b/src/audio_karaoke.cpp @@ -35,7 +35,7 @@ #include "selection_controller.h" #include "utils.h" -#include +#include #include #include @@ -66,7 +66,7 @@ AudioKaraoke::AudioKaraoke(wxWindow *parent, agi::Context *c) , audio_opened(c->audioController->AddAudioOpenListener(&AudioKaraoke::OnAudioOpened, this)) , audio_closed(c->audioController->AddAudioCloseListener(&AudioKaraoke::OnAudioClosed, this)) , active_line_changed(c->selectionController->AddActiveLineListener(&AudioKaraoke::OnActiveLineChanged, this)) -, kara(agi::util::make_unique()) +, kara(agi::make_unique()) { using std::bind; diff --git a/src/audio_marker.cpp b/src/audio_marker.cpp index ecef26423..967c28a83 100644 --- a/src/audio_marker.cpp +++ b/src/audio_marker.cpp @@ -26,7 +26,7 @@ #include "pen.h" #include "video_context.h" -#include +#include #include @@ -48,7 +48,7 @@ AudioMarkerProviderKeyframes::AudioMarkerProviderKeyframes(agi::Context *c, cons , timecode_slot(vc->AddTimecodesListener(&AudioMarkerProviderKeyframes::Update, this)) , enabled_slot(OPT_SUB(opt_name, &AudioMarkerProviderKeyframes::Update, this)) , enabled_opt(OPT_GET(opt_name)) -, style(agi::util::make_unique("Colour/Audio Display/Keyframe")) +, style(agi::make_unique("Colour/Audio Display/Keyframe")) { Update(); } @@ -122,7 +122,7 @@ void VideoPositionMarkerProvider::Update(int frame_number) { void VideoPositionMarkerProvider::OptChanged(agi::OptionValue const& opt) { if (opt.GetBool()) { video_seek_slot.Unblock(); - marker = agi::util::make_unique(); + marker = agi::make_unique(); marker->SetPosition(vc->GetFrameN()); } else { @@ -137,7 +137,7 @@ void VideoPositionMarkerProvider::GetMarkers(const TimeRange &range, AudioMarker } SecondsMarkerProvider::SecondsMarkerProvider() -: pen(agi::util::make_unique("Colour/Audio Display/Seconds Line", 1, wxPENSTYLE_DOT)) +: pen(agi::make_unique("Colour/Audio Display/Seconds Line", 1, wxPENSTYLE_DOT)) , enabled(OPT_GET("Audio/Display/Draw/Seconds")) , enabled_opt_changed(OPT_SUB("Audio/Display/Draw/Seconds", &SecondsMarkerProvider::EnabledOptChanged, this)) { diff --git a/src/audio_player_alsa.cpp b/src/audio_player_alsa.cpp index 0bf76eaad..52e545f82 100644 --- a/src/audio_player_alsa.cpp +++ b/src/audio_player_alsa.cpp @@ -42,7 +42,7 @@ #include "options.h" #include -#include +#include #include #include @@ -461,7 +461,7 @@ void AlsaPlayer::SetVolume(double vol) std::unique_ptr CreateAlsaPlayer(AudioProvider *provider, wxWindow *) { - return agi::util::make_unique(provider); + return agi::make_unique(provider); } #endif // WITH_ALSA diff --git a/src/audio_player_dsound.cpp b/src/audio_player_dsound.cpp index c5b690f79..da6f41ba9 100644 --- a/src/audio_player_dsound.cpp +++ b/src/audio_player_dsound.cpp @@ -41,7 +41,7 @@ #include "utils.h" #include -#include +#include #include #include @@ -368,7 +368,7 @@ void DirectSoundPlayerThread::Stop() { } std::unique_ptr CreateDirectSoundPlayer(AudioProvider *provider, wxWindow *parent) { - return agi::util::make_unique(provider, parent); + return agi::make_unique(provider, parent); } #endif // WITH_DIRECTSOUND diff --git a/src/audio_player_dsound2.cpp b/src/audio_player_dsound2.cpp index 81e6a0213..b5f396e37 100644 --- a/src/audio_player_dsound2.cpp +++ b/src/audio_player_dsound2.cpp @@ -43,7 +43,7 @@ #include #include -#include +#include #include #include @@ -821,7 +821,7 @@ DirectSoundPlayer2::DirectSoundPlayer2(AudioProvider *provider, wxWindow *parent try { - thread = agi::util::make_unique(provider, WantedLatency, BufferLength, parent); + thread = agi::make_unique(provider, WantedLatency, BufferLength, parent); } catch (const char *msg) { @@ -936,7 +936,7 @@ void DirectSoundPlayer2::SetVolume(double vol) } std::unique_ptr CreateDirectSound2Player(AudioProvider *provider, wxWindow *parent) { - return agi::util::make_unique(provider, parent); + return agi::make_unique(provider, parent); } #endif // WITH_DIRECTSOUND diff --git a/src/audio_player_openal.cpp b/src/audio_player_openal.cpp index 3dbe84934..fb298939d 100644 --- a/src/audio_player_openal.cpp +++ b/src/audio_player_openal.cpp @@ -40,7 +40,7 @@ #include "utils.h" #include -#include +#include #ifdef __WINDOWS__ #include @@ -286,7 +286,7 @@ int64_t OpenALPlayer::GetCurrentPosition() std::unique_ptr CreateOpenALPlayer(AudioProvider *provider, wxWindow *) { - return agi::util::make_unique(provider); + return agi::make_unique(provider); } #endif // WITH_OPENAL diff --git a/src/audio_player_oss.cpp b/src/audio_player_oss.cpp index ea3262b93..1f915ef41 100644 --- a/src/audio_player_oss.cpp +++ b/src/audio_player_oss.cpp @@ -40,7 +40,7 @@ #include "utils.h" #include -#include +#include #include #include @@ -281,7 +281,7 @@ int64_t OSSPlayer::GetCurrentPosition() } std::unique_ptr CreateOSSPlayer(AudioProvider *provider, wxWindow *) { - return agi::util::make_unique(provider); + return agi::make_unique(provider); } #endif // WITH_OSS diff --git a/src/audio_player_portaudio.cpp b/src/audio_player_portaudio.cpp index d4dfcf989..271c29331 100644 --- a/src/audio_player_portaudio.cpp +++ b/src/audio_player_portaudio.cpp @@ -42,7 +42,7 @@ #include "utils.h" #include -#include +#include DEFINE_SIMPLE_EXCEPTION(PortAudioError, agi::AudioPlayerOpenError, "audio/player/open/portaudio") @@ -282,7 +282,7 @@ bool PortAudioPlayer::IsPlaying() { } std::unique_ptr CreatePortAudioPlayer(AudioProvider *provider, wxWindow *) { - return agi::util::make_unique(provider); + return agi::make_unique(provider); } #endif // WITH_PORTAUDIO diff --git a/src/audio_player_pulse.cpp b/src/audio_player_pulse.cpp index fe47ebb3a..27a9591e4 100644 --- a/src/audio_player_pulse.cpp +++ b/src/audio_player_pulse.cpp @@ -40,7 +40,7 @@ #include "utils.h" #include -#include +#include #include #include @@ -334,6 +334,6 @@ void PulseAudioPlayer::pa_stream_notify(pa_stream *p, PulseAudioPlayer *thread) } std::unique_ptr CreatePulseAudioPlayer(AudioProvider *provider, wxWindow *) { - return agi::util::make_unique(provider); + return agi::make_unique(provider); } #endif // WITH_LIBPULSE diff --git a/src/audio_provider.cpp b/src/audio_provider.cpp index 6242ec4ec..e74c5adf9 100644 --- a/src/audio_provider.cpp +++ b/src/audio_provider.cpp @@ -43,7 +43,7 @@ #include #include #include -#include +#include #include diff --git a/src/audio_provider_avs.cpp b/src/audio_provider_avs.cpp index 7ce009620..8af99ae2e 100644 --- a/src/audio_provider_avs.cpp +++ b/src/audio_provider_avs.cpp @@ -45,7 +45,7 @@ #include #include #include -#include +#include #include @@ -146,6 +146,6 @@ void AvisynthAudioProvider::FillBuffer(void *buf, int64_t start, int64_t count) } std::unique_ptr CreateAvisynthAudioProvider(agi::fs::path const& file, agi::BackgroundRunner *) { - return agi::util::make_unique(file); + return agi::make_unique(file); } #endif diff --git a/src/audio_provider_convert.cpp b/src/audio_provider_convert.cpp index 6033df778..aae6c4f17 100644 --- a/src/audio_provider_convert.cpp +++ b/src/audio_provider_convert.cpp @@ -24,7 +24,7 @@ #include "audio_controller.h" #include -#include +#include #include @@ -131,7 +131,7 @@ public: } }; -/// Sample doubler with linear interpolation for the agi::util::make_unique +/// Sample doubler with linear interpolation for the agi::make_unique /// Requires 16-bit mono input class SampleDoublingAudioProvider final : public AudioProviderWrapper { public: @@ -177,25 +177,25 @@ std::unique_ptr CreateConvertAudioProvider(std::unique_ptrAreSamplesFloat()) { LOG_D("audio_provider") << "Converting float to S16"; if (provider->GetBytesPerSample() == sizeof(float)) - provider = agi::util::make_unique>(std::move(provider)); + provider = agi::make_unique>(std::move(provider)); else - provider = agi::util::make_unique>(std::move(provider)); + provider = agi::make_unique>(std::move(provider)); } if (provider->GetBytesPerSample() != 2) { LOG_D("audio_provider") << "Converting " << provider->GetBytesPerSample() << " bytes per sample or wrong endian to S16"; - provider = agi::util::make_unique>(std::move(provider)); + provider = agi::make_unique>(std::move(provider)); } // We currently only support mono audio if (provider->GetChannels() != 1) { LOG_D("audio_provider") << "Downmixing to mono from " << provider->GetChannels() << " channels"; - provider = agi::util::make_unique(std::move(provider)); + provider = agi::make_unique(std::move(provider)); } // Some players don't like low sample rate audio while (provider->GetSampleRate() < 32000) { LOG_D("audio_provider") << "Doubling sample rate"; - provider = agi::util::make_unique(std::move(provider)); + provider = agi::make_unique(std::move(provider)); } return provider; diff --git a/src/audio_provider_dummy.cpp b/src/audio_provider_dummy.cpp index c44b4cf02..1a314ee4f 100644 --- a/src/audio_provider_dummy.cpp +++ b/src/audio_provider_dummy.cpp @@ -35,7 +35,7 @@ #include "include/aegisub/audio_provider.h" #include -#include +#include #include @@ -89,5 +89,5 @@ public: std::unique_ptr CreateDummyAudioProvider(agi::fs::path const& file, agi::BackgroundRunner *) { if (!boost::starts_with(file.string(), "dummy-audio:")) return {}; - return agi::util::make_unique(file); + return agi::make_unique(file); } diff --git a/src/audio_provider_ffmpegsource.cpp b/src/audio_provider_ffmpegsource.cpp index 15734c413..9672ab56a 100644 --- a/src/audio_provider_ffmpegsource.cpp +++ b/src/audio_provider_ffmpegsource.cpp @@ -40,7 +40,7 @@ #include "options.h" #include -#include +#include #include @@ -207,7 +207,7 @@ void FFmpegSourceAudioProvider::LoadAudio(agi::fs::path const& filename) { } std::unique_ptr CreateFFmpegSourceAudioProvider(agi::fs::path const& file, agi::BackgroundRunner *br) { - return agi::util::make_unique(file, br); + return agi::make_unique(file, br); } #endif /* WITH_FFMS2 */ diff --git a/src/audio_provider_hd.cpp b/src/audio_provider_hd.cpp index 65d7b0257..fc166fea2 100644 --- a/src/audio_provider_hd.cpp +++ b/src/audio_provider_hd.cpp @@ -23,7 +23,7 @@ #include #include #include -#include +#include #include #include @@ -72,7 +72,7 @@ public: % (long long)time(nullptr) % (long long)boost::interprocess::ipcdetail::get_current_process_id()); - file = agi::util::make_unique(cache_dir / filename, num_samples * bytes_per_sample); + file = agi::make_unique(cache_dir / filename, num_samples * bytes_per_sample); decoder = std::thread([&] { int64_t block = 65536; for (int64_t i = 0; i < num_samples; i += block) { @@ -92,5 +92,5 @@ public: } std::unique_ptr CreateHDAudioProvider(std::unique_ptr src) { - return agi::util::make_unique(std::move(src)); + return agi::make_unique(std::move(src)); } diff --git a/src/audio_provider_lock.cpp b/src/audio_provider_lock.cpp index c89437ac7..904832898 100644 --- a/src/audio_provider_lock.cpp +++ b/src/audio_provider_lock.cpp @@ -18,7 +18,7 @@ #include "include/aegisub/audio_provider.h" -#include +#include #include #include @@ -41,5 +41,5 @@ public: } std::unique_ptr CreateLockAudioProvider(std::unique_ptr src) { - return agi::util::make_unique(std::move(src)); + return agi::make_unique(std::move(src)); } diff --git a/src/audio_provider_pcm.cpp b/src/audio_provider_pcm.cpp index d97fc1daa..54e53b542 100644 --- a/src/audio_provider_pcm.cpp +++ b/src/audio_provider_pcm.cpp @@ -40,7 +40,7 @@ #include #include #include -#include +#include #include @@ -51,7 +51,7 @@ protected: std::unique_ptr file; PCMAudioProvider(agi::fs::path const& filename) - : file(agi::util::make_unique(filename)) + : file(agi::make_unique(filename)) { float_samples = false; } @@ -365,7 +365,7 @@ std::unique_ptr CreatePCMAudioProvider(agi::fs::path const& filen std::string msg; try { - return agi::util::make_unique(filename); + return agi::make_unique(filename); } catch (agi::AudioDataNotFoundError const& err) { msg = "RIFF PCM WAV audio provider: " + err.GetMessage(); @@ -376,7 +376,7 @@ std::unique_ptr CreatePCMAudioProvider(agi::fs::path const& filen } try { - return agi::util::make_unique(filename); + return agi::make_unique(filename); } catch (agi::AudioDataNotFoundError const& err) { msg += "\nWave64 audio provider: " + err.GetMessage(); diff --git a/src/audio_provider_ram.cpp b/src/audio_provider_ram.cpp index 07a55fcaa..d460c010e 100644 --- a/src/audio_provider_ram.cpp +++ b/src/audio_provider_ram.cpp @@ -37,7 +37,7 @@ #include "audio_controller.h" #include "compat.h" -#include +#include #include #include @@ -112,5 +112,5 @@ void RAMAudioProvider::FillBuffer(void *buf, int64_t start, int64_t count) const } std::unique_ptr CreateRAMAudioProvider(std::unique_ptr src) { - return agi::util::make_unique(std::move(src)); + return agi::make_unique(std::move(src)); } diff --git a/src/audio_renderer.cpp b/src/audio_renderer.cpp index 90b4c6e56..5f804672e 100644 --- a/src/audio_renderer.cpp +++ b/src/audio_renderer.cpp @@ -35,7 +35,7 @@ #include "include/aegisub/audio_provider.h" -#include +#include #include #include @@ -61,7 +61,7 @@ AudioRendererBitmapCacheBitmapFactory::AudioRendererBitmapCacheBitmapFactory(Aud std::unique_ptr AudioRendererBitmapCacheBitmapFactory::ProduceBlock(int /* i */) { - return agi::util::make_unique(renderer->cache_bitmap_width, renderer->pixel_height, 24); + return agi::make_unique(renderer->cache_bitmap_width, renderer->pixel_height, 24); } size_t AudioRendererBitmapCacheBitmapFactory::GetBlockSize() const diff --git a/src/audio_renderer_spectrum.cpp b/src/audio_renderer_spectrum.cpp index 4d75ab241..bbb60bd05 100644 --- a/src/audio_renderer_spectrum.cpp +++ b/src/audio_renderer_spectrum.cpp @@ -42,7 +42,7 @@ #include "utils.h" #include -#include +#include #include @@ -123,7 +123,7 @@ void AudioSpectrumRenderer::RecreateCache() if (provider) { size_t block_count = (size_t)((provider->GetNumSamples() + (size_t)(1<> derivation_dist); - cache = agi::util::make_unique(block_count, this); + cache = agi::make_unique(block_count, this); #ifdef WITH_FFTW3 dft_input = fftw_alloc_real(2< +#include #include #include @@ -411,7 +411,7 @@ public: std::unique_ptr CreateDialogueTimingController(agi::Context *c) { - return agi::util::make_unique(c); + return agi::make_unique(c); } AudioTimingControllerDialogue::AudioTimingControllerDialogue(agi::Context *c) diff --git a/src/audio_timing_karaoke.cpp b/src/audio_timing_karaoke.cpp index 9c3614ed0..8ff6e5d52 100644 --- a/src/audio_timing_karaoke.cpp +++ b/src/audio_timing_karaoke.cpp @@ -34,7 +34,7 @@ #include "selection_controller.h" #include "utils.h" -#include +#include #include #include @@ -152,7 +152,7 @@ public: std::unique_ptr CreateKaraokeTimingController(agi::Context *c, AssKaraoke *kara, agi::signal::Connection& file_changed) { - return agi::util::make_unique(c, kara, file_changed); + return agi::make_unique(c, kara, file_changed); } AudioTimingControllerKaraoke::AudioTimingControllerKaraoke(agi::Context *c, AssKaraoke *kara, agi::signal::Connection& file_changed) diff --git a/src/auto4_base.cpp b/src/auto4_base.cpp index 94a661de5..05a0bb96e 100644 --- a/src/auto4_base.cpp +++ b/src/auto4_base.cpp @@ -48,7 +48,7 @@ #include #include #include -#include +#include #include #include @@ -482,7 +482,7 @@ namespace Automation4 { wxLogError(_("The file was not recognised as an Automation script: %s"), filename.wstring()); } - return create_unknown ? agi::util::make_unique(filename) : nullptr; + return create_unknown ? agi::make_unique(filename) : nullptr; } std::vector>& ScriptFactory::Factories() diff --git a/src/auto4_lua.cpp b/src/auto4_lua.cpp index 8611cdbd8..23a112d21 100644 --- a/src/auto4_lua.cpp +++ b/src/auto4_lua.cpp @@ -53,7 +53,7 @@ #include #include -#include +#include #include #include @@ -773,7 +773,7 @@ namespace Automation4 { int LuaCommand::LuaRegister(lua_State *L) { static std::mutex mutex; - auto command = agi::util::make_unique(L); + auto command = agi::make_unique(L); { std::lock_guard lock(mutex); cmd::reg(std::move(command)); @@ -1048,7 +1048,7 @@ namespace Automation4 { int LuaExportFilter::LuaRegister(lua_State *L) { static std::mutex mutex; - auto filter = agi::util::make_unique(L); + auto filter = agi::make_unique(L); { std::lock_guard lock(mutex); AssExportFilterChain::Register(std::move(filter)); @@ -1130,7 +1130,7 @@ namespace Automation4 { std::unique_ptr