Changeset 318 for trunk/src_apollo/org/apollo/widgets/SampledTrack.java

Timestamp:

09/23/08 16:00:42 (16 years ago)

Author:

bjn8

Message:

Refactored a class name and extended recorder widgets to have a perminant lifetime option (for optimum idea capturing!)

File:

• trunk/src_apollo/org/apollo/widgets/SampledTrack.java (moved) (moved from trunk/src_apollo/org/apollo/widgets/SampledTrackEvo4.java ) (15 diffs)

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

@@ -77 +77 @@
  *
  */
-public class SampledTrackEvo4 extends HeavyDutyInteractiveWidget 
+public class SampledTrack extends HeavyDutyInteractiveWidget 
         implements TrackModelHandler, EffecientInvalidator, Observer {
 
@@ -133 +133 @@
          * 
          */
-        private SampledTrackEvo4(Text source, byte[] audioBytes, AudioFormat format, TrackMixSubject mixTemplate) {
+        private SampledTrack(Text source, byte[] audioBytes, AudioFormat format, TrackMixSubject mixTemplate) {
                 
                 super(source, new EditableSampledTrackGraphView(), 
@@ -179 +179 @@
          *              Can have a ARG_IMPORT_TAG argument...
          */
-        public SampledTrackEvo4(Text source, String[] args) {
+        public SampledTrack(Text source, String[] args) {
                 super(source, new EditableSampledTrackGraphView(), 
                                 100, -1, 
@@ -292 +292 @@
                                         
                                         // Determine where popup should show
-                                        int x = SampledTrackEvo4.this.getX();
-                                        int y = SampledTrackEvo4.this.getY() - playbackControlPopup.getHeight() - 2; // by default show above
+                                        int x = SampledTrack.this.getX();
+                                        int y = SampledTrack.this.getY() - playbackControlPopup.getHeight() - 2; // by default show above
                                         
                                         // I get sick.dizzy from the popup expanding from the whole thing...
@@ -300 +300 @@
                                         
                                         if (y < 0) {
-                                                y = SampledTrackEvo4.this.getY() + SampledTrackEvo4.this.getHeight() + 2;
+                                                y = SampledTrack.this.getY() + SampledTrack.this.getHeight() + 2;
                                                 animationSource.y = y - 2;
                                         } 
@@ -432 +432 @@
                                 if (trackModel != null && !nameLabel.getText().equals(trackModel.getName())) {
                                         trackModel.setName(nameLabel.getText());
-                                        SampledTrackEvo4.this.updateData(TrackWidgetCommons.META_NAME_TAG, trackModel.getName());
+                                        SampledTrack.this.updateData(TrackWidgetCommons.META_NAME_TAG, trackModel.getName());
                                         
                                 }
@@ -449 +449 @@
 
         /**
-         * Creates a {@link SampledTrackEvo4} instantly from audio bytes in memory and adds it to a given frame.
+         * Creates a {@link SampledTrack} instantly from audio bytes in memory and adds it to a given frame.
          * @param audioBytes
          *                      The audio samples.
@@ -474 +474 @@
          *                      If null then default mix settings will be used.
          * 
-         * @return The {@link SampledTrackEvo4} instance added to the given frame.
-         * 
-         */
-        public static SampledTrackEvo4 createFromMemory(
+         * @return The {@link SampledTrack} instance added to the given frame.
+         * 
+         */
+        public static SampledTrack createFromMemory(
                         byte[] audioBytes, 
                         AudioFormat format,
@@ -530 +530 @@
                 source.setData(data);
                 
-                SampledTrackEvo4 strack = new SampledTrackEvo4(source, audioBytes, format, mixTemplate);
+                SampledTrack strack = new SampledTrack(source, audioBytes, format, mixTemplate);
 
                 return strack;
@@ -537 +537 @@
         
         /**
-         * Creates a {@link SampledTrackEvo4} from file - which is tyo be imported into apollos
+         * Creates a {@link SampledTrack} from file - which is tyo be imported into apollos
          * 
          * @param targetFrame
@@ -545 +545 @@
          *                      The audio file to import
          * 
-         * @return The {@link SampledTrackEvo4} instance added to the given frame.
-         * 
-         */
-        public static SampledTrackEvo4 createFromFile(File file, Frame targetFrame, int x, int y) {
+         * @return The {@link SampledTrack} instance added to the given frame.
+         * 
+         */
+        public static SampledTrack createFromFile(File file, Frame targetFrame, int x, int y) {
                 assert (targetFrame != null);
                 assert (file != null);
@@ -576 +576 @@
                 source.setData(data);
 
-                SampledTrackEvo4 strack = new SampledTrackEvo4(source, args);
+                SampledTrack strack = new SampledTrack(source, args);
 
                 return strack;
@@ -632 +632 @@
                 } else {
 
-                        return SampledTrackEvo4.createFromMemory(
+                        return SampledTrack.createFromMemory(
                                         trackModel.getAllAudioBytesCopy(),
                                         trackModel.getFormat(), 
@@ -1793 +1793 @@
                                 invalidateStateIcons();
 
-                                SampledTrackEvo4.this.setWidgetEdgeThickness(TrackWidgetCommons.PLAYING_TRACK_EDGE_THICKNESS);
+                                SampledTrack.this.setWidgetEdgeThickness(TrackWidgetCommons.PLAYING_TRACK_EDGE_THICKNESS);
                                 //FrameGraphics.refresh(true);
                                         break;
@@ -1809 +1809 @@
                                 // and will get garbage collected
                                 
-                                SampledTrackEvo4.this.setWidgetEdgeThickness(TrackWidgetCommons.STOPPED_TRACK_EDGE_THICKNESS);
+                                SampledTrack.this.setWidgetEdgeThickness(TrackWidgetCommons.STOPPED_TRACK_EDGE_THICKNESS);
 
                                 break;