← Back to branch summary

~daschuer/mixxx/autodj

« back to all changes in this revision

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

  • Committer: Daniel Schürmann
  • Date: 2012-03-01 22:34:57 UTC
  • mfrom: (2793.1.194 trunk)
  • Revision ID: daschuer@gmx.de-20120301223457-t5oj4r3ceua8uzd5
merged with lp:mixxx

Show diffs side-by-side

added added

removed removed

Lines of Context:
mixxx/src/engine/bpmcontrol.h
20
20
    double getBpm();
21
21
 
22
22
  public slots:
 
23
 
 
24
    virtual void trackLoaded(TrackPointer pTrack);
 
25
    virtual void trackUnloaded(TrackPointer pTrack);
 
26
 
 
27
  private slots:
23
28
    void slotSetEngineBpm(double);
24
29
    void slotFileBpmChanged(double);
25
30
    void slotControlBeatSync(double);
26
 
    virtual void trackLoaded(TrackPointer pTrack);
27
 
    virtual void trackUnloaded(TrackPointer pTrack);
28
 
 
29
 
  private slots:
 
31
    void slotControlBeatSyncPhase(double);
 
32
    void slotControlBeatSyncTempo(double);
30
33
    void slotTapFilter(double,int);
31
34
    void slotBpmTap(double);
32
35
    void slotRateChanged(double);
34
37
    void slotBeatsTranslate(double);
35
38
 
36
39
  private:
37
 
    void adjustPhase();
 
40
    bool syncTempo();
 
41
    bool syncPhase();
38
42
 
39
43
    // ControlObjects that come from EngineBuffer
40
44
    ControlObject* m_pPlayButton;
53
57
 
54
58
    /** Button for sync'ing with the other EngineBuffer */
55
59
    ControlPushButton* m_pButtonSync;
 
60
    ControlPushButton* m_pButtonSyncPhase;
 
61
    ControlPushButton* m_pButtonSyncTempo;
56
62
 
57
63
    // Button that translates the beats so the nearest beat is on the current
58
64
    // playposition.