xiRetimer

commit

e790b326f0358fd13860fde1c1b9bb352492f9e7

parent

5d7c2e5dd8d4d04a89290ba3ac6f47b3a66d5abb

Author

Tobias Bengfort <tobias.bengfort@gmx.net>

Date

2010-11-21 21:07

update with prefs

Diffstat

6 files changed, 10 insertions, 9 deletions

diff --git a/src/curve.cpp b/src/curve.cpp

@@ -8,6 +8,7 @@ Curve::Curve(Marker* m, Sample* s, Playback* p) {
    8     8   selMarker=-1;
    9     9   beatResolution=1;
   10    10   _showIntLine=false;
   -1    11   _update=true;
   11    12 }
   12    13 
   13    14 Curve::~Curve() {

diff --git a/src/curve.h b/src/curve.h

@@ -33,6 +33,7 @@ public:
   33    33   void setTempo(int bpm);
   34    34   int getTempo();
   35    35   bool _showIntLine;
   -1    36   bool _update;
   36    37 private:
   37    38   Marker* marker;
   38    39   Sample* sample;

diff --git a/src/gui/RetimerMainFrame.cpp b/src/gui/RetimerMainFrame.cpp

@@ -22,7 +22,6 @@ RetimerMainFrame::RetimerMainFrame( wxWindow* parent ) : MainFrame( parent ) {
   22    22   penSeeker=new wxPen(*wxWHITE,1);
   23    23   penMarker=new wxPen(wxColor(255,255,0),1);
   24    24   wxBitmap waveform;
   25    -1   _updateWaveform=true;
   26    25 
   27    26   timer;
   28    27   timer.SetOwner(this);
@@ -72,7 +71,7 @@ void RetimerMainFrame::OnLeftDClick( wxMouseEvent& event ) {
   72    71       if (event.m_x<=n+MARKERWIDTH/2 && event.m_x>=n-MARKERWIDTH/2) {
   73    72         curve->selectMarker(i);
   74    73         curve->removeMarker();
   75    -1         _updateWaveform=true;
   -1    74         curve->_update=true;
   76    75         return;
   77    76       }
   78    77     }
@@ -84,7 +83,7 @@ void RetimerMainFrame::OnLeftDClick( wxMouseEvent& event ) {
   84    83 void RetimerMainFrame::OnMotion( wxMouseEvent& event ) {
   85    84   if (Marker_move) {
   86    85     curve->setMarker(event.m_x/(float)width);
   87    -1     _updateWaveform=true;
   -1    86     curve->_update=true;
   88    87   }
   89    88   if (Seeker_move)
   90    89     playback->setSeeker(event.m_x/(float)width);
@@ -103,7 +102,7 @@ void RetimerMainFrame::OnOpenClick( wxCommandEvent& event )
  103   102       return;
  104   103     }
  105   104     process();
  106    -1     _updateWaveform=true;
   -1   105     curve->_update=true;
  107   106   }
  108   107 //  else
  109   108 //    reportError( _T("Please choose a valid file!"));
@@ -156,7 +155,7 @@ void RetimerMainFrame::OnHelpClick( wxCommandEvent& event )
  156   155 // ************  marker  **************
  157   156 void RetimerMainFrame::OnClearClick( wxCommandEvent& event ) {
  158   157   curve->clearMarker();
  159    -1   _updateWaveform=true;
   -1   158   curve->_update=true;
  160   159 }
  161   160 
  162   161 
@@ -177,7 +176,7 @@ void RetimerMainFrame::paint(wxDC* dc) {
  177   176   dc->GetSize(&width,&height);
  178   177   wxBufferedDC bdc(dc,wxSize(width,height));
  179   178   // waveform
  180    -1   if (_updateWaveform) {
   -1   179   if (curve->_update) {
  181   180     waveform.Create(width, height);
  182   181     wxMemoryDC mdc;
  183   182     mdc.SelectObject(waveform);
@@ -200,7 +199,7 @@ void RetimerMainFrame::paint(wxDC* dc) {
  200   199         mdc.DrawLine(int(x1*width),i,int(x2*width),i+1);
  201   200       }
  202   201     }
  203    -1     _updateWaveform=false;
   -1   202     curve->_update=false;
  204   203   }
  205   204   bdc.DrawBitmap(waveform,0,0,false);
  206   205   // marker
@@ -230,7 +229,7 @@ void RetimerMainFrame::paint(wxDC* dc) {
  230   229 }
  231   230 
  232   231 void RetimerMainFrame::OnSize( wxSizeEvent& event ) {
  233    -1   _updateWaveform=true;
   -1   232   curve->_update=true;
  234   233 }
  235   234 
  236   235 

diff --git a/src/gui/RetimerMainFrame.h b/src/gui/RetimerMainFrame.h

@@ -53,7 +53,6 @@ protected:
   53    53   void OnTimer(wxTimerEvent& event);
   54    54 
   55    55   void process();
   56    -1   bool _updateWaveform;
   57    56   void reportError(wxString string);
   58    57   static const int MARKERWIDTH=15;
   59    58   static const int BEAT=15;

diff --git a/src/gui/RetimerPrefsDialog.cpp b/src/gui/RetimerPrefsDialog.cpp

@@ -54,6 +54,7 @@ void RetimerPrefsDialog::OnBeatResEnter( wxCommandEvent& event ) {
   54    54 }
   55    55 
   56    56 void RetimerPrefsDialog::OnOKClick( wxCommandEvent& event ) {
   -1    57   curve->_update=true;
   57    58   Close();
   58    59 }
   59    60 

diff --git a/xiRetimer b/xiRetimer