← Back to branch summary

~keithsalisbury/mixxx/mixxx

« back to all changes in this revision

Viewing changes to mixxx/src/controlbeat.h

  • Committer: Keith Salisbury
  • Date: 2012-05-06 13:44:20 UTC
  • mfrom: (2994.1.100 mixxx-trunk)
  • Revision ID: keithsalisbury@gmail.com-20120506134420-8k1dqq10aqmx0ecq
merge with trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
mixxx/src/controlbeat.h
21
21
#include "controlobject.h"
22
22
#include "configobject.h"
23
23
#include "defs.h"
24
 
#include "midi/midimessage.h"
25
24
#include <qdatetime.h>
26
25
 
27
26
/**
45
44
    virtual ~ControlBeat();
46
45
 
47
46
  protected:
48
 
    void setValueFromMidi(MidiCategory c, double v);
 
47
    void setValueFromMidi(MidiOpCode o, double v);
49
48
    void setValueFromThread(double dValue);
50
49
  private:
51
50
    void beatTap();