diff --git a/src/Track.cpp b/src/Track.cpp index 533f01c..c68071b 100644 --- a/src/Track.cpp +++ b/src/Track.cpp @@ -6,11 +6,12 @@ */ Track::Track(): - m_soloState(false), m_activatedState(false), m_id(0) + m_id(0), m_file(""), m_name(""), + m_soloState(false), m_activatedState(false) {} Track::Track(const TrackData& data, Parameters conf, int id): - m_file(data.file), m_name(data.name), m_id(id), + m_id(id), m_file(data.file), m_name(data.name), m_soloState(false), m_activatedState(false) { m_volumePtr = std::make_shared>(conf); diff --git a/src/Track.h b/src/Track.h index 8184767..e1e44af 100644 --- a/src/Track.h +++ b/src/Track.h @@ -29,13 +29,6 @@ class Track : public QObject { Q_OBJECT private: - std::shared_ptr> m_muteState; /*< Mute state in the audio engine */ - std::shared_ptr> m_volumePtr; /*< Volume in the audio engine */ - std::shared_ptr> m_panPtr; /*< Pan in the audio engine */ - - double m_volume; /*< "Raw" volume */ - double m_pan; /*< "Raw" pan */ - unsigned int m_id; /*< Track number (default : its position in the PlayThread Tracks vector) */ std::string m_file; /*< Filepath */ @@ -43,6 +36,13 @@ class Track : public QObject bool m_soloState; bool m_activatedState; + std::shared_ptr> m_volumePtr; /*< Volume in the audio engine */ + std::shared_ptr> m_panPtr; /*< Pan in the audio engine */ + std::shared_ptr> m_muteState; /*< Mute state in the audio engine */ + + double m_volume; /*< "Raw" volume */ + double m_pan; /*< "Raw" pan */ + public: Track(); /**