Mixxx

Merge lp:~alex-marin89/mixxx/fastrewind into lp:~mixxxdevelopers/mixxx/trunk

  1. fastrewind
  2. Merge into trunk
Proposed by alex marin
Status: Merged
Merge reported by: Sean M. Pappalardo
Merged at revision: not available
Proposed branch: lp:~alex-marin89/mixxx/fastrewind
Merge into: lp:~mixxxdevelopers/mixxx/trunk
Diff against target: 59 lines (+9/-7)
3 files modified
mixxx/src/analyserbpm.cpp (+0/-1)
mixxx/src/controlobject.h (+4/-4)
mixxx/src/engine/enginebuffer.cpp (+5/-2)
To merge this branch: bzr merge lp:~alex-marin89/mixxx/fastrewind
Reviewer Review Type Date Requested Status
Sean M. Pappalardo Approve
Review via email: mp+57724@code.launchpad.net

Description of the change

the song does not stop playing anymore when you reach the beginning of the file by fast rewinding.

To post a comment you must log in.
Revision history for this message
Sean M. Pappalardo (pegasus-renegadetech) wrote :

As per the linked bug, this functionality is now already included. Feel free to delete the branch.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'mixxx/src/analyserbpm.cpp'
2--- mixxx/src/analyserbpm.cpp 2011-02-26 07:08:21 +0000
3+++ mixxx/src/analyserbpm.cpp 2011-04-14 16:32:29 +0000
4@@ -1,4 +1,3 @@
5-
6 #include <QtDebug>
7
8 #include "BPMDetect.h"
9
10=== modified file 'mixxx/src/controlobject.h'
11--- mixxx/src/controlobject.h 2011-04-04 05:36:08 +0000
12+++ mixxx/src/controlobject.h 2011-04-14 16:32:29 +0000
13@@ -64,7 +64,7 @@
14 virtual ~ControlObject();
15 /** Connect two control objects dest and src, so each time src is updated, so is dest. */
16 static bool connectControls(ConfigKey src, ConfigKey dest);
17- /** Disonnect a control object. */
18+ /** Disconnect a control object. */
19 static bool disconnectControl(ConfigKey key);
20 /** Returns a pointer to the ControlObject matching the given ConfigKey */
21 static ControlObject *getControl(ConfigKey key);
22@@ -76,8 +76,8 @@
23 void addProxy(ControlObjectThread *pControlObjectThread);
24 // To get rid of a proxy when the corresponding object is being deleted for example
25 void removeProxy(ControlObjectThread *pControlObjectThread);
26- /** Update proxies, execep the one given a pointer to. Returns true if all updates
27- * happend, otherwise false. */
28+ /** Update proxies, except the one given a pointer to. Returns true if all updates
29+ * happened, otherwise false. */
30 bool updateProxies(ControlObjectThread *pProxyNoUpdate=0);
31 /** Return the key of the object */
32 ConfigKey getKey();
33@@ -87,7 +87,7 @@
34 void add(double dValue);
35 /** Subtract from value. Not thread safe. */
36 void sub(double dValue);
37- /** Syncronizes all ControlObjects with their corresponding proxies. */
38+ /** Synchronizes all ControlObjects with their corresponding proxies. */
39 static void sync();
40 /** Queue a control change from a widget. Thread safe. Blocking. */
41 void queueFromThread(double dValue, ControlObjectThread *pControlObjectThread=0);
42
43=== modified file 'mixxx/src/engine/enginebuffer.cpp'
44--- mixxx/src/engine/enginebuffer.cpp 2011-04-07 05:08:22 +0000
45+++ mixxx/src/engine/enginebuffer.cpp 2011-04-14 16:32:29 +0000
46@@ -599,8 +599,11 @@
47
48 bool repeat_enabled = m_pRepeat->get() != 0.0f;
49
50- bool end_of_track = (at_start && backwards) ||
51- (at_end && !backwards);
52+ //Uncomment the line below if you want the song to stop
53+ //when it reaches the end while going backwards
54+ bool end_of_track = (at_start && !backwards);
55+ // || (at_start && backwards);
56+
57
58 // If playbutton is pressed, check if we are at start or end of track
59 if ((playButton->get() || (fwdButton->get() || backButton->get()))