Changeset 331

Timestamp:

09/25/08 16:52:18 (16 years ago)

Author:

bjn8

Message:

Added metronome functionality + widget

Location:

trunk/src_apollo/org/apollo

Files:

• ApolloSystem.java (modified) (1 diff)
• audio/ApolloSubjectChangedEvent.java (modified) (1 diff)
• audio/Metronome.java (added)
• widgets/MetronomePlayer.java (added)
• widgets/SampledTrack.java (modified) (1 diff)

trunk/src_apollo/org/apollo/ApolloSystem.java

@@ -210 +210 @@
                                                                 }
                                                                 
+                                                                int smallestX = FreeItems.getInstance().get(0).getX();
+                                                                int smallestY = FreeItems.getInstance().get(0).getY();
+
+                                                                for (Item i : FreeItems.getInstance()) {
+                                                                        if (i.getX() < smallestX) smallestX = i.getX();
+                                                                        if (i.getY() < smallestY) smallestY = i.getY();
+                                                                }
+                                                                
                                                                 // Should auto-adjust free items?
                                                                 if (closestDistance > 0 &&
                                                                                 closestDistance < COARSE_PLACEMENT_TOLERANCE) { // NB: 0 = do nothing since already there
-                                                
-                                                                        int smallestX = FreeItems.getInstance().get(0).getX();
         
                                                                         for (Item i : FreeItems.getInstance()) {
-                                                                                if (i.getX() < smallestX) smallestX = i.getX();
-                                                                        }
-                                                                        
-                                                                        for (Item i : FreeItems.getInstance()) {
-                                                                                i.setX(closestXPosition + (i.getX() - smallestX));
+                                                                                i.setPosition(
+                                                                                                closestXPosition + (i.getX() - smallestX), 
+                                                                                                e.getY() + (i.getY() - smallestY));
+                                                                                
                                                                         }
                                                                         
                                                                 } else if (closestDistance > 0) { // keep things set to cursor
-                                                                        
-                                                                        int smallestX = FreeItems.getInstance().get(0).getX();
-                                                                        int largestX = FreeItems.getInstance().get(0).getX();
-                                                                        
+
                                                                         for (Item i : FreeItems.getInstance()) {
-                                                                                
-                                                                                if (i.getX() < smallestX) smallestX = i.getX();
-                                                                                
-                                                                                else if ((i.getX() + i.getWidth()) > largestX) 
-                                                                                        largestX = i.getX() + i.getWidth();
-                                                                        }
-                                                                        
-                                                                        for (Item i : FreeItems.getInstance()) {
-                                                                                i.setX(e.getX() + (i.getX() - smallestX));
+                                                                                i.setPosition(
+                                                                                                e.getX() + (i.getX() - smallestX), 
+                                                                                                e.getY() + (i.getY() - smallestY));
                                                                         }
                         

trunk/src_apollo/org/apollo/audio/ApolloSubjectChangedEvent.java

@@ -68 +68 @@
         public static final int LOAD_STATUS_REPORT = 200;
         
-        public static final int RENDER_TASK_INVALIDATION_RECOMENDATION= 300;
+        public static final int RENDER_TASK_INVALIDATION_RECOMENDATION = 300;
         
+        public static final int METRONOME_BEATS_PER_MEASURE_CHANGED = 600;
+        public static final int METRONOME_TEMPO_CHANGED = 601;
+        public static final int METRONOME_STARTED = 602;
+        public static final int METRONOME_STOPPED = 603;
         
 }

trunk/src_apollo/org/apollo/widgets/SampledTrack.java

@@ -618 +618 @@
                 data.add(TrackWidgetCommons.META_INITIATIONTIME_TAG + initTime);
                 
+                data.add(TrackWidgetCommons.META_RUNNINGMSTIME_TAG + getRunningMSTimeFromRawAudio());
 
                 return data;