diff options
author | Andreas Kling <kling@serenityos.org> | 2020-02-02 12:34:39 +0100 |
---|---|---|
committer | Andreas Kling <kling@serenityos.org> | 2020-02-02 15:15:30 +0100 |
commit | 2d39da5405a4527e91e853ddb1e56a539c96c6c1 (patch) | |
tree | 342f5d553c844f05b550510de27d5b7c937daf90 /Libraries/LibAudio | |
parent | b7e3810b5c3d7e52217e70eed61132d9f670648d (diff) | |
download | serenity-2d39da5405a4527e91e853ddb1e56a539c96c6c1.zip |
LibCore: Put all classes in the Core namespace and remove the leading C
I've been wanting to do this for a long time. It's time we start being
consistent about how this stuff works.
The new convention is:
- "LibFoo" is a userspace library that provides the "Foo" namespace.
That's it :^) This was pretty tedious to convert and I didn't even
start on LibGUI yet. But it's coming up next.
Diffstat (limited to 'Libraries/LibAudio')
-rw-r--r-- | Libraries/LibAudio/AWavLoader.cpp | 6 | ||||
-rw-r--r-- | Libraries/LibAudio/AWavLoader.h | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/Libraries/LibAudio/AWavLoader.cpp b/Libraries/LibAudio/AWavLoader.cpp index 424a17b135..0bfc36d6c5 100644 --- a/Libraries/LibAudio/AWavLoader.cpp +++ b/Libraries/LibAudio/AWavLoader.cpp @@ -31,9 +31,9 @@ #include <limits> AWavLoader::AWavLoader(const StringView& path) - : m_file(CFile::construct(path)) + : m_file(Core::File::construct(path)) { - if (!m_file->open(CIODevice::ReadOnly)) { + if (!m_file->open(Core::IODevice::ReadOnly)) { m_error_string = String::format("Can't open file: %s", m_file->error_string()); return; } @@ -75,7 +75,7 @@ void AWavLoader::reset() bool AWavLoader::parse_header() { - CIODeviceStreamReader stream(*m_file); + Core::IODeviceStreamReader stream(*m_file); #define CHECK_OK(msg) \ do { \ diff --git a/Libraries/LibAudio/AWavLoader.h b/Libraries/LibAudio/AWavLoader.h index 980823d502..8b6b553879 100644 --- a/Libraries/LibAudio/AWavLoader.h +++ b/Libraries/LibAudio/AWavLoader.h @@ -56,11 +56,11 @@ public: u32 sample_rate() const { return m_sample_rate; } u16 num_channels() const { return m_num_channels; } u16 bits_per_sample() const { return m_bits_per_sample; } - RefPtr<CFile> file() const { return m_file; } + RefPtr<Core::File> file() const { return m_file; } private: bool parse_header(); - RefPtr<CFile> m_file; + RefPtr<Core::File> m_file; String m_error_string; OwnPtr<AResampleHelper> m_resampler; |