← Back to branch summary

~mixxxdevelopers/mixxx/features_beatcontrol

« back to all changes in this revision

Viewing changes to mixxx/src/controlobjectthread.h

  • Committer: Phillip Whelan
  • Date: 2011-04-08 03:31:20 UTC
  • mfrom: (2556.1.8 mixxx-beatcontrol)
  • Revision ID: pwhelan@mixxx.org-20110408033120-hb4s7u9zgnbk1xhy
Merging from upstream.

Show diffs side-by-side

added added

removed removed

Lines of Context:
mixxx/src/controlobjectthread.h
40
40
{
41
41
    Q_OBJECT
42
42
public:
43
 
    ControlObjectThread(ControlObject *pControlObject);
 
43
    ControlObjectThread(ControlObject *pControlObject, QObject* pParent=NULL);
44
44
    virtual ~ControlObjectThread();
45
45
    /** Returns the value of the object */
46
46
    double get();