← Back to branch summary

~mkas/mixxx/mysql

« back to all changes in this revision

Viewing changes to mixxx/src/engine/bpmcontrol.h

  • Committer: MKas
  • Date: 2012-11-03 12:55:54 UTC
  • Revision ID: mkas@tux.lt-20121103125554-ez5ajqyk7bwehrp2
merge with trunk + sql fixes

Show diffs side-by-side

added added

removed removed

Lines of Context:
mixxx/src/engine/bpmcontrol.h
10
10
 
11
11
class ControlObject;
12
12
class ControlPushButton;
 
13
class EngineBuffer;
13
14
 
14
15
class BpmControl : public EngineControl {
15
16
    Q_OBJECT
37
38
    void slotBeatsTranslate(double);
38
39
 
39
40
  private:
40
 
    bool syncTempo();
41
 
    bool syncPhase();
 
41
    EngineBuffer* pickSyncTarget();
 
42
    bool syncTempo(EngineBuffer* pOtherEngineBuffer);
 
43
    bool syncPhase(EngineBuffer* pOtherEngineBuffer);
 
44
 
 
45
    // ControlObjects that come from PlayerManager
 
46
    ControlObject* m_pNumDecks;
42
47
 
43
48
    // ControlObjects that come from EngineBuffer
44
49
    ControlObject* m_pPlayButton;