Changeset 365 for trunk/src_apollo/org/apollo/audio/util/MultiTrackPlaybackController.java

Timestamp:

10/11/08 00:11:49 (16 years ago)

Author:

bjn8

Message:

Added accurate position of tracks when anchored in groups

File:

• trunk/src_apollo/org/apollo/audio/util/MultiTrackPlaybackController.java (modified) (10 diffs)

trunk/src_apollo/org/apollo/audio/util/MultiTrackPlaybackController.java

@@ -223 +223 @@
                         // Can get many of these over time in one playback call... so make sure that a event is raised
                         // on the first event received...
-                        System.out.println("MULTI ApolloSubjectChangedEvent.PLAYBACK_STARTED");
                         if (isPlaybackPending) {
                                 isPlaybackPending = false;
-                                initiationFramePosition = ((TrackSequence)source).getInitiationFrame();
+                                initiationFramePosition = ((TrackSequence)source).getCommencedFrame();
                                 suspendedFramePosition = 0;
                                 fireSubjectChanged(new SubjectChangedEvent(ApolloSubjectChangedEvent.PLAYBACK_STARTED));
@@ -236 +235 @@
                 case ApolloSubjectChangedEvent.PLAYBACK_STOPPED:
 
-                        System.out.println("MULTI ApolloSubjectChangedEvent.PLAYBACK_STOPPED");
                         if (currentTrackSequences != null && !currentTrackSequences.isEmpty()) {
                                 
@@ -550 +548 @@
                         String masterMixID,
                         boolean resume,
-                        int relativeStartFrame,
                         int startFrame,
                         int endFrame) {
                 
-                assert(relativeStartFrame >= 0);
                 assert(startFrame >= 0);
                 assert(endFrame > startFrame);
@@ -603 +599 @@
 
                         // Play back ..s
-                        commencePlayback(relativeStartFrame, startFrame, endFrame, loadListeners);
+                        commencePlayback(startFrame, endFrame, loadListeners);
                         
                         
@@ -609 +605 @@
         
                         // Load track and their start positions
-                        loaderThread = new MultiTrackPlaybackLoader(relativeStartFrame, startFrame, endFrame, loadListeners);
+                        loaderThread = new MultiTrackPlaybackLoader(startFrame, endFrame, loadListeners);
                         
                         // Notify when in loading state.
@@ -662 +658 @@
          * Must not be in a playing state. MUST BE ON THE SWING THREAD.
          * 
-         * @param relativeStartFrame
-         *              The start frame from when all the tracks should commence in the playback mixer.
-         *              Must be positive.
-         * 
          * @param startFrame
          *              The start from from <i>within</i> the group of tracks when playback should begin.
@@ -677 +669 @@
          */
         private void commencePlayback(
-                        int relativeStartFrame,
                         int startFrame,
                         int endFrame,
@@ -822 +813 @@
                 
                 private OverdubbedFrame rootODFrame = null;
-                private int relativeStartFrame;
                 private int startFrame;
                 private int endFrame;
                 private List<MultitrackLoadListener> loadListeners = null; // reference immutable, contents not. Shared resource
                 
-                MultiTrackPlaybackLoader(int relativeStartFrame,
+                MultiTrackPlaybackLoader(
                                 int startFrame,
                                 int endFrame,
@@ -835 +825 @@
                         
                         this.loadListeners = loadListeners;
-                        this.relativeStartFrame = relativeStartFrame;
                         this.startFrame = startFrame;
                         this.endFrame = endFrame;
@@ -1152 +1141 @@
                                 currentODFrame = rootODFrame;
 
-                                commencePlayback(relativeStartFrame, startFrame, endFrame, loadListeners);
+                                commencePlayback(startFrame, endFrame, loadListeners);