Changeset 318

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!)

Location:

trunk/src_apollo/org/apollo

Files:

• agents/MelodySearch.java (modified) (6 diffs)
• audio/structure/AudioStructureModel.java (modified) (4 diffs)
• audio/util/FrameLayoutDaemon.java (modified) (4 diffs)
• audio/util/SoundDesk.java (modified) (2 diffs)
• gui/EditableSampledTrackGraphView.java (modified) (4 diffs)
• gui/FrameRenderPasses.java (modified) (5 diffs)
• io/SampledAudioFileImporter.java (modified) (2 diffs)
• meldex/MeldexConversion.java (modified) (2 diffs)
• widgets/SampleRecorder.java (modified) (10 diffs)
• widgets/SampledTrack.java (moved) (moved from trunk/src_apollo/org/apollo/widgets/SampledTrackEvo4.java ) (15 diffs)

trunk/src_apollo/org/apollo/agents/MelodySearch.java

@@ -23 +23 @@
 import org.apollo.util.TextItemSearchResult;
 import org.apollo.widgets.LinkedTrack;
-import org.apollo.widgets.SampledTrackEvo4;
+import org.apollo.widgets.SampledTrack;
 import org.apollo.widgets.TrackWidgetCommons;
 import org.expeditee.agents.SearchAgent;
@@ -54 +54 @@
         
         /** Either querry from raw audio or track widget: */
-        private SampledTrackEvo4 querryTrack = null; 
+        private SampledTrack querryTrack = null; 
         
         /** Either querry from raw audio  or track widget: */
@@ -113 +113 @@
                         }
 
-                        if (iw != null && iw instanceof SampledTrackEvo4) {
-                                querryTrack = (SampledTrackEvo4)iw;
+                        if (iw != null && iw instanceof SampledTrack) {
+                                querryTrack = (SampledTrack)iw;
                         }
                         
@@ -140 +140 @@
                         String linkedTrackPrefix = trackPrefix;
                         
-                        trackPrefix += SampledTrackEvo4.class.getName();
+                        trackPrefix += SampledTrack.class.getName();
                         linkedTrackPrefix += LinkedTrack.class.getName();
                         
@@ -250 +250 @@
                 
                                                 // should this widget be indexed?
-                                                if (res.containsData(SampledTrackEvo4.META_DONT_INDEX_AUDIO_TAG)) continue;
+                                                if (res.containsData(SampledTrack.META_DONT_INDEX_AUDIO_TAG)) continue;
                                                 
                                                 // get the local filename
@@ -258 +258 @@
                                                 // Parse meta
                                                 for (String data : res.data) {
-                                                        if (data.startsWith(SampledTrackEvo4.META_LOCALNAME_TAG) &&
-                                                                        data.length() > SampledTrackEvo4.META_LOCALNAME_TAG.length()) {
-                                                                localFilename = data.substring(SampledTrackEvo4.META_LOCALNAME_TAG.length());
+                                                        if (data.startsWith(SampledTrack.META_LOCALNAME_TAG) &&
+                                                                        data.length() > SampledTrack.META_LOCALNAME_TAG.length()) {
+                                                                localFilename = data.substring(SampledTrack.META_LOCALNAME_TAG.length());
                                                                 if (trackName != null) break;
                                                         } else if (data.startsWith(TrackWidgetCommons.META_NAME_TAG) &&

trunk/src_apollo/org/apollo/audio/structure/AudioStructureModel.java

@@ -25 +25 @@
 import org.apollo.util.TextItemSearchResult;
 import org.apollo.widgets.LinkedTrack;
-import org.apollo.widgets.SampledTrackEvo4;
+import org.apollo.widgets.SampledTrack;
 import org.apollo.widgets.TrackWidgetCommons;
 import org.expeditee.gui.DisplayIO;
@@ -286 +286 @@
                         String linkedTrackPrefix = trackPrefix;
                         
-                        trackPrefix += SampledTrackEvo4.class.getName();
+                        trackPrefix += SampledTrack.class.getName();
                         linkedTrackPrefix += LinkedTrack.class.getName();
 
@@ -325 +325 @@
                                                         data = data.trim();
                                                         
-                                                        if (data.startsWith(SampledTrackEvo4.META_LOCALNAME_TAG) &&
-                                                                        data.length() > SampledTrackEvo4.META_LOCALNAME_TAG.length()) {
-                                                                localFileName = data.substring(SampledTrackEvo4.META_LOCALNAME_TAG.length());
+                                                        if (data.startsWith(SampledTrack.META_LOCALNAME_TAG) &&
+                                                                        data.length() > SampledTrack.META_LOCALNAME_TAG.length()) {
+                                                                localFileName = data.substring(SampledTrack.META_LOCALNAME_TAG.length());
                                                         
                                                         } else if (data.startsWith(TrackWidgetCommons.META_INITIATIONTIME_TAG) 
@@ -589 +589 @@
                                 for (InteractiveWidget iw : rootFrame.getInteractiveWidgets()) {
                                         
-                                        if (iw instanceof SampledTrackEvo4) {
-                                                SampledTrackEvo4 sampledTrackWidget = (SampledTrackEvo4)iw;
+                                        if (iw instanceof SampledTrack) {
+                                                SampledTrack sampledTrackWidget = (SampledTrack)iw;
 
                                                 TrackGraphNode tinf = 

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

@@ -27 +27 @@
 import org.apollo.util.NullableLong;
 import org.apollo.widgets.LinkedTrack;
-import org.apollo.widgets.SampledTrackEvo4;
+import org.apollo.widgets.SampledTrack;
 import org.expeditee.gui.Browser;
 import org.expeditee.gui.DisplayIO;
@@ -331 +331 @@
                                         AbstractTrackGraphNode abinf = null;
 
-                                        if (iw instanceof SampledTrackEvo4) {
-                                                SampledTrackEvo4 sampledTrackWidget = (SampledTrackEvo4)iw;
+                                        if (iw instanceof SampledTrack) {
+                                                SampledTrack sampledTrackWidget = (SampledTrack)iw;
                         
 
@@ -493 +493 @@
                                         
                                         int width = -1;
-                                        if (freespaceTrackToFormat instanceof SampledTrackEvo4) {
-                                                
-                                                long rt = ((SampledTrackEvo4)freespaceTrackToFormat).getRunningMSTimeFromRawAudio();
-                                                if (rt <= 0) rt = ((SampledTrackEvo4)freespaceTrackToFormat).getRunningMSTimeFromMeta();
+                                        if (freespaceTrackToFormat instanceof SampledTrack) {
+                                                
+                                                long rt = ((SampledTrack)freespaceTrackToFormat).getRunningMSTimeFromRawAudio();
+                                                if (rt <= 0) rt = ((SampledTrack)freespaceTrackToFormat).getRunningMSTimeFromMeta();
                                                 if (rt > 0) {
                                                         width = (int)(currentTimeline.getPixelPerTime() * rt);
@@ -674 +674 @@
                 for (InteractiveWidget iw : frame.getInteractiveWidgets()) {
                         
-                        if (iw instanceof SampledTrackEvo4) {
-                                SampledTrackEvo4 sampledTrackWidget = (SampledTrackEvo4)iw;
+                        if (iw instanceof SampledTrack) {
+                                SampledTrack sampledTrackWidget = (SampledTrack)iw;
 
                                 // TrackGraphModel provides best data

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

@@ -25 +25 @@
 import org.apollo.mvc.SubjectChangedEvent;
 import org.apollo.widgets.LinkedTrack;
-import org.apollo.widgets.SampledTrackEvo4;
+import org.apollo.widgets.SampledTrack;
 import org.expeditee.gui.Frame;
 
@@ -1015 +1015 @@
          *              The channel ID... never null.
          */
-        public static String createPureLocalChannelID(SampledTrackEvo4 sampledTrackWidget) {
+        public static String createPureLocalChannelID(SampledTrack sampledTrackWidget) {
                 assert(sampledTrackWidget != null);
                 return createPureLocalChannelID(sampledTrackWidget.getLocalFileName());

trunk/src_apollo/org/apollo/gui/EditableSampledTrackGraphView.java

@@ -22 +22 @@
 import org.apollo.mvc.SubjectChangedEvent;
 import org.apollo.util.TrackNameCreator;
-import org.apollo.widgets.SampledTrackEvo4;
+import org.apollo.widgets.SampledTrack;
 import org.expeditee.gui.Browser;
 import org.expeditee.gui.DisplayIO;
@@ -175 +175 @@
                                 || e.getButton() == MouseEvent.BUTTON3) && !FreeItems.getInstance().isEmpty())) {
                         
-                        SampledTrackEvo4 floatingTrack = null;
+                        SampledTrack floatingTrack = null;
                         
                         // Look for a floating track for injection of audio bytes
                         for (Item i : FreeItems.getInstance()) {
                                 if (i instanceof WidgetCorner) {
-                                        if (((WidgetCorner)i).getWidgetSource() instanceof SampledTrackEvo4) {
-                                                floatingTrack = (SampledTrackEvo4)((WidgetCorner)i).getWidgetSource();
+                                        if (((WidgetCorner)i).getWidgetSource() instanceof SampledTrack) {
+                                                floatingTrack = (SampledTrack)((WidgetCorner)i).getWidgetSource();
                                                 break;
                                         }
@@ -259 +259 @@
 
         /**
-         * Copies the selection into free space as a {@link SampledTrackEvo4}
+         * Copies the selection into free space as a {@link SampledTrack}
          * 
          * @param e
@@ -273 +273 @@
                         if (targetFrame != null) {
                                 
-                                SampledTrackEvo4 twidget = SampledTrackEvo4.createFromMemory(
+                                SampledTrack twidget = SampledTrack.createFromMemory(
                                                 copiedAudioRegion, 
                                                 getSampledTrackModel().getFormat(),

trunk/src_apollo/org/apollo/gui/FrameRenderPasses.java

@@ -15 +15 @@
 import org.apollo.widgets.LinkedTrack;
 import org.apollo.widgets.SampleRecorder;
-import org.apollo.widgets.SampledTrackEvo4;
+import org.apollo.widgets.SampledTrack;
 import org.expeditee.gui.Browser;
 import org.expeditee.gui.FrameGraphics;
@@ -55 +55 @@
 
                         // Conceivable could have multiple
-                        LinkedList<SampledTrackEvo4> toPaint = null;
+                        LinkedList<SampledTrack> toPaint = null;
                         
                         for (Item i : FreeItems.getInstance()) {
@@ -61 +61 @@
                                         InteractiveWidget iw = ((WidgetCorner)i).getWidgetSource();
                                         
-                                        if (iw != null && iw instanceof SampledTrackEvo4) {
+                                        if (iw != null && iw instanceof SampledTrack) {
                                                 
                                                 if (toPaint == null) {
-                                                        toPaint = new LinkedList<SampledTrackEvo4>();
+                                                        toPaint = new LinkedList<SampledTrack>();
                                                 } else if (toPaint.contains(iw)) {
                                                         continue;
                                                 }
                                                 
-                                                toPaint.add((SampledTrackEvo4)iw);
+                                                toPaint.add((SampledTrack)iw);
                                         }
                                 }
@@ -75 +75 @@
                         
                         if (toPaint != null) {
-                                for (SampledTrackEvo4 trackWidget : toPaint) {
+                                for (SampledTrack trackWidget : toPaint) {
                                         if (g.getClip() == null
                                                         || g.getClip().intersects(trackWidget.getComponant().getBounds()))
@@ -198 +198 @@
                                 if (iw != null) {
                                         
-                                        if (iw != null && (iw instanceof SampledTrackEvo4 ||
+                                        if (iw != null && (iw instanceof SampledTrack ||
                                                         iw instanceof LinkedTrack || iw instanceof SampleRecorder)) {
                                                 

trunk/src_apollo/org/apollo/io/SampledAudioFileImporter.java

@@ -5 +5 @@
 import java.io.IOException;
 
-import org.apollo.widgets.SampledTrackEvo4;
+import org.apollo.widgets.SampledTrack;
 import org.expeditee.gui.DisplayIO;
 import org.expeditee.importer.FileImporter;
@@ -23 +23 @@
                                 DisplayIO.getCurrentFrame() == null) return null;
                 
-                SampledTrackEvo4 trackWidget = SampledTrackEvo4.createFromFile(
+                SampledTrack trackWidget = SampledTrack.createFromFile(
                                 f,
                                 DisplayIO.getCurrentFrame(), 

trunk/src_apollo/org/apollo/meldex/MeldexConversion.java

@@ -7 +7 @@
 
 import org.apollo.io.AudioIO;
-import org.apollo.widgets.SampledTrackEvo4;
+import org.apollo.widgets.SampledTrack;
 
 /**
@@ -25 +25 @@
          *              If conversion fails.
          */
-        public static Melody toMelody(SampledTrackEvo4 trackWidget) throws IOException {
+        public static Melody toMelody(SampledTrack trackWidget) throws IOException {
                 
                 assert(trackWidget != null);

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

@@ -17 +17 @@
 import java.io.IOException;
 import java.io.PipedInputStream;
+import java.util.LinkedList;
+import java.util.List;
 
 import javax.sound.sampled.AudioFormat;
@@ -49 +51 @@
 import org.expeditee.gui.Frame;
 import org.expeditee.gui.FrameGraphics;
+import org.expeditee.gui.FrameMouseActions;
 import org.expeditee.items.ItemParentStateChangedEvent;
 import org.expeditee.items.Text;
 import org.expeditee.items.widgets.InteractiveWidget;
 
+/**
+ * Records sampled audio ... the cornerstone widget to Apollo.
+ * 
+ * @author Brook Novak
+ *
+ */
 public class SampleRecorder extends InteractiveWidget 
         implements ActionListener, Observer, MultitrackLoadListener {
@@ -85 +94 @@
         private boolean hasExplicityStopped = false;
         
+        private boolean isSelfDestructable = false;
+        
         private final static int BUTTON_HEIGHT = 50;
         private final static int LABEL_HEIGHT = 30;
@@ -97 +108 @@
         
         private final static int RENDER_POINTS_PER_SECOND = 20; // how many points to render each second
+        
+        private final static String SELF_DESTRUCT_OFF_META = "permanent";
+        private final static String COUNTDOWN_META = "countdown=";
+        
         
         public SampleRecorder(Text source, String[] args) {
@@ -105 +120 @@
                                 COUNTDOWN_SETTINGS_HEIGHT + BUTTON_HEIGHT + LABEL_HEIGHT + AnimatedSampleGraph.GRAPH_HEIGHT + (4 * VERT_SPACING));
                 
+                isSelfDestructable = !containsDataTrimmedIgnoreCase(SELF_DESTRUCT_OFF_META);
+                int countdown = getStrippedDataInt(COUNTDOWN_META, 0);
+                if (countdown < 0) countdown = 0;
+                else if (countdown > MAX_COUNTDOWN_TIME)
+                        countdown = MAX_COUNTDOWN_TIME;
+
                 // Create gui layout
                 recordButton = new JButton();
@@ -133 +154 @@
                 countDownSpinner = new JSpinner(model);
                 countDownSpinner.setPreferredSize(new Dimension(50, COUNTDOWN_SETTINGS_HEIGHT));
-                
+                countDownSpinner.setValue(countdown);
+
                 countDownSpinnerLabel = new JLabel("Count down:");
                 countDownSpinnerLabel.setPreferredSize(new Dimension(AnimatedSampleGraph.GRAPH_WIDTH - 50, COUNTDOWN_SETTINGS_HEIGHT));
@@ -307 +329 @@
                                 
                         } else {
-
-                                // Remove this temporary widget
-                                removeSelf();
+                                
+                                if (isSelfDestructable) {
+                                        // Remove this temporary widget
+                                        removeSelf();
+                                }
                         
                                 // Spawn an audio track using the actual bytes and audio format buffered from
@@ -326 +350 @@
                                          if (!shouldPlayback) initiationTime = -1;
                                          
-                                         SampledTrackEvo4 trackWidget = SampledTrackEvo4.createFromMemory(
+                                         SampledTrack trackWidget = SampledTrack.createFromMemory(
                                                          audioByteReader.bufferedAudioBytes.toByteArray(), 
                                                          audioByteReader.audioFormat, 
@@ -336 +360 @@
                                                          null);
                                          
-                                         targetFrame.addAllItems(trackWidget.getItems());
+                                         if (isSelfDestructable) {
+                                                 
+                                                 targetFrame.addAllItems(trackWidget.getItems());
+                
+                                         } else {
+                                                 
+                                                 FrameMouseActions.pickup(trackWidget.getItems());
+                                                        
+                                                // Reset the state
+                                                setState(WidgetState.Ready, "Ready"); 
+                                                
+                                         }
         
                                          
@@ -379 +414 @@
                 return null;
         }
-        
+
+        @Override
+        protected List<String> getData() {
+
+                List<String> data = new LinkedList<String>();
+                
+                if (isSelfDestructable) 
+                        data.add(SELF_DESTRUCT_OFF_META);
+                
+                data.add(COUNTDOWN_META + countDownSpinner.getValue());
+
+                return data;
+        }
+
         @Override
         protected void onParentStateChanged(int eventType) {

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;