From 70e0af6444cf3c32815039f05feefa48bfe87fcc Mon Sep 17 00:00:00 2001
From: Tristan Matthews <tristan.matthews@savoirfairelinux.com>
Date: Tue, 28 Feb 2012 12:28:03 -0500
Subject: [PATCH] * #8968: AudioFile: initialize filepath earlier
---
daemon/src/audio/sound/audiofile.cpp | 10 +++-------
daemon/src/audio/sound/audiofile.h | 4 ++--
2 files changed, 5 insertions(+), 9 deletions(-)
diff --git a/daemon/src/audio/sound/audiofile.cpp b/daemon/src/audio/sound/audiofile.cpp
index 4325de6bf5..c9f88e6975 100644
--- a/daemon/src/audio/sound/audiofile.cpp
+++ b/daemon/src/audio/sound/audiofile.cpp
@@ -44,15 +44,12 @@
#include "manager.h"
-RawFile::RawFile(const std::string& name, sfl::AudioCodec* codec, unsigned int sampleRate)
- : audioCodec_(codec)
+RawFile::RawFile(const std::string& name, sfl::AudioCodec *codec, unsigned int sampleRate)
+ : AudioFile(name), audioCodec_(codec)
{
- filepath_ = name;
-
if (filepath_.empty())
throw AudioFileException("Unable to open audio file: filename is empty");
-
std::fstream file;
file.open(filepath_.c_str(), std::fstream::in);
@@ -114,14 +111,13 @@ RawFile::RawFile(const std::string& name, sfl::AudioCodec* codec, unsigned int s
}
-WaveFile::WaveFile(const std::string& fileName, int newRate)
+WaveFile::WaveFile(const std::string &fileName, int newRate) : AudioFile(fileName)
{
const std::fstream fs(fileName.c_str(), std::ios_base::in);
if (!fs)
throw AudioFileException("File " + fileName + " doesn't exist");
- filepath_ = fileName;
std::fstream fileStream;
fileStream.open(fileName.c_str(), std::ios::in | std::ios::binary);
diff --git a/daemon/src/audio/sound/audiofile.h b/daemon/src/audio/sound/audiofile.h
index 0963e40dd2..a914f1cbc4 100644
--- a/daemon/src/audio/sound/audiofile.h
+++ b/daemon/src/audio/sound/audiofile.h
@@ -43,7 +43,7 @@ class AudioCodec;
class AudioFileException : public std::runtime_error {
public:
- AudioFileException(const std::string& str = "") :
+ AudioFileException(const std::string &str) :
std::runtime_error("AudioFile: AudioFileException occured: " + str) {}
};
@@ -52,7 +52,7 @@ class AudioFileException : public std::runtime_error {
*/
class AudioFile : public AudioLoop {
public:
- AudioFile() : filepath_() {}
+ AudioFile(const std::string &filepath) : filepath_(filepath) {}
std::string getFilePath() const {
return filepath_;
}
--
GitLab