Skip to content

Commit

Permalink
Fixed warnings
Browse files Browse the repository at this point in the history
  • Loading branch information
carlou33 committed Jul 25, 2016
1 parent 80360ce commit 378c46b
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 9 deletions.
5 changes: 3 additions & 2 deletions src/Track.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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<double> 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<Amplify<double>>(conf);
Expand Down
14 changes: 7 additions & 7 deletions src/Track.h
Original file line number Diff line number Diff line change
Expand Up @@ -29,20 +29,20 @@ class Track : public QObject
{
Q_OBJECT
private:
std::shared_ptr<Mute<double>> m_muteState; /*< Mute state in the audio engine */
std::shared_ptr<Amplify<double>> m_volumePtr; /*< Volume in the audio engine */
std::shared_ptr<Pan<double>> 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 */

std::string m_name;
bool m_soloState;
bool m_activatedState;

std::shared_ptr<Amplify<double>> m_volumePtr; /*< Volume in the audio engine */
std::shared_ptr<Pan<double>> m_panPtr; /*< Pan in the audio engine */
std::shared_ptr<Mute<double>> m_muteState; /*< Mute state in the audio engine */

double m_volume; /*< "Raw" volume */
double m_pan; /*< "Raw" pan */

public:
Track();
/**
Expand Down

0 comments on commit 378c46b

Please sign in to comment.