/[svn]/jsampler/trunk/src/org/jsampler/DefaultSamplerChannelModel.java

Diff of /jsampler/trunk/src/org/jsampler/DefaultSamplerChannelModel.java

Parent Directory | Revision Log | View Patch Patch

-revision 2287 by iliev,
Sun Jul  3 22:01:16 2011 UTC
+revision 2288 by iliev,
Wed Nov 23 21:19:44 2011 UTC
 Line 24 
 package org.jsampler;
  import java.util.Vector;
- import javax.swing.SwingUtilities;
+ import net.sf.juife.PDUtils;
  import net.sf.juife.Task;
  import net.sf.juife.event.TaskEvent;
  import net.sf.juife.event.TaskListener;
-Line 90 
 public class DefaultSamplerChannelModel
+Line 89 
 public class DefaultSamplerChannelModel
           * Registers the specified listener for receiving event messages.
           * @param l The <code>SamplerChannelListener</code> to register.
           */
+         @Override
          public void
          addSamplerChannelListener(SamplerChannelListener l) { listeners.add(l); }
 Line 97 
 public class DefaultSamplerChannelModel
           * Removes the specified listener.
           * @param l The <code>SamplerChannelListener</code> to remove.
           */
+         @Override
          public void
          removeSamplerChannelListener(SamplerChannelListener l) { listeners.remove(l); }
-Line 104 
 public class DefaultSamplerChannelModel
+Line 105 
 public class DefaultSamplerChannelModel
           * Registers the specified listener for receiving event messages.
           * @param l The <code>EffectSendsListener</code> to register.
           */
+         @Override
          public void
          addEffectSendsListener(EffectSendsListener l) { fxListeners.add(l); }
-Line 111 
 public class DefaultSamplerChannelModel
+Line 113 
 public class DefaultSamplerChannelModel
           * Removes the specified listener.
           * @param l The <code>EffectSendsListener</code> to remove.
           */
+         @Override
          public void
          removeEffectSendsListener(EffectSendsListener l) { fxListeners.remove(l); }
-Line 119 
 public class DefaultSamplerChannelModel
+Line 122 
 public class DefaultSamplerChannelModel
           * MIDI events are sent to the channel.
           * @param l The <code>MidiDataListener</code> to register.
           */
+         @Override
          public void
          addMidiDataListener(MidiDataListener l) { midiListeners.add(l); }
-Line 126 
 public class DefaultSamplerChannelModel
+Line 130 
 public class DefaultSamplerChannelModel
           * Removes the specified listener.
           * @param l The <code>MidiDataListener</code> to remove.
           */
+         @Override
          public void
          removeMidiDataListener(MidiDataListener l) { midiListeners.remove(l); }
-Line 133 
 public class DefaultSamplerChannelModel
+Line 138 
 public class DefaultSamplerChannelModel
           * Gets the sampler channel number.
           * @return The sampler channel number or -1 if the sampler channel number is not set.
           */
+         @Override
          public int
          getChannelId() { return channel == null ? -1 : channel.getChannelId(); }
-Line 141 
 public class DefaultSamplerChannelModel
+Line 147 
 public class DefaultSamplerChannelModel
           * @return <code>SamplerChannel</code> instance containing
           * the current settings of the sampler channel.
           */
+         @Override
          public SamplerChannel
          getChannelInfo() { return channel; }
-Line 152 
 public class DefaultSamplerChannelModel
+Line 159 
 public class DefaultSamplerChannelModel
           * the new settings for this sampler channel.
           * @throws IllegalArgumentException If <code>channel</code> is <code>null</code>.
           */
+         @Override
          public void
          setChannelInfo(SamplerChannel channel) {
                  if(channel == null) throw new IllegalArgumentException("channel must be non null");
-Line 165 
 public class DefaultSamplerChannelModel
+Line 173 
 public class DefaultSamplerChannelModel
           * Gets the number of active disk streams.
           * @return The number of active disk streams.
           */
+         @Override
          public int
          getStreamCount() { return streamCount; }
-Line 174 
 public class DefaultSamplerChannelModel
+Line 183 
 public class DefaultSamplerChannelModel
           * of active disk streams on the backend side.
           * @param count The new number of active disk streams.
           */
+         @Override
          public void
          setStreamCount(int count) {
                  if(streamCount == count) return;
-Line 186 
 public class DefaultSamplerChannelModel
+Line 196 
 public class DefaultSamplerChannelModel
           * Gets the number of active voices.
           * @return The number of active voices.
           */
+         @Override
          public int
          getVoiceCount() { return voiceCount; }
-Line 195 
 public class DefaultSamplerChannelModel
+Line 206 
 public class DefaultSamplerChannelModel
           * of active voices on the backend side.
           * @param count The new number of active voices.
           */
+         @Override
          public void
          setVoiceCount(int count) {
                  if(voiceCount == count) return;
-Line 207 
 public class DefaultSamplerChannelModel
+Line 219 
 public class DefaultSamplerChannelModel
           * Schedules a new task for setting the sampler engine type to be used.
           * @param engine The name of the engine type to be used.
           */
+         @Override
          public void
          setBackendEngineType(String engine) {
                  final LoadEngine loadEngine = new LoadEngine(engine, getChannelId());
-Line 233 
 public class DefaultSamplerChannelModel
+Line 246 
 public class DefaultSamplerChannelModel
           * @param mute Specifies the mute mode. If <code>true</code> the channel is muted, else
           * the channel is unmuted.
           */
+         @Override
          public void
          setBackendMute(boolean mute) {
                  final SetMute smc = new SetMute(getChannelId(), mute);
-Line 259 
 public class DefaultSamplerChannelModel
+Line 273 
 public class DefaultSamplerChannelModel
           * @param solo Specifies the solo mode. If <code>true</code> the channel is soloed, else
           * the channel is unsoloed.
           */
+         @Override
          public void
          setBackendSolo(boolean solo) {
                  final SetSolo ssc = new SetSolo(getChannelId(), solo);
-Line 284 
 public class DefaultSamplerChannelModel
+Line 299 
 public class DefaultSamplerChannelModel
           * Schedules a new task for setting the channel volume on the backend side.
           * @param volume Specifies the new volume value.
           */
+         @Override
          public void
          setBackendVolume(float volume) {
                  final SetVolume scv = new SetVolume(getChannelId(), volume);
-Line 310 
 public class DefaultSamplerChannelModel
+Line 326 
 public class DefaultSamplerChannelModel
           * device of the channel represented by this model.
           * @param deviceId Specifies the numerical ID of the MIDI input device to be set.
           */
+         @Override
          public void
          setBackendMidiInputDevice(int deviceId) {
                  final Task scmid = new SetMidiInputDevice(getChannelId(), deviceId);
-Line 336 
 public class DefaultSamplerChannelModel
+Line 353 
 public class DefaultSamplerChannelModel
           * MIDI input port of the channel represented by this model.
           * @param port Specifies the number of the MIDI input port.
           */
+         @Override
          public void
          setBackendMidiInputPort(int port) {
                  final Task scmip = new SetMidiInputPort(getChannelId(), port);
-Line 363 
 public class DefaultSamplerChannelModel
+Line 381 
 public class DefaultSamplerChannelModel
           * @param channel Specifies the MIDI channel that the channel
           * represented by this model should listen to.
           */
+         @Override
          public void
          setBackendMidiInputChannel(int channel) {
                  final Task scmic = new SetMidiInputChannel(getChannelId(), channel);
-Line 389 
 public class DefaultSamplerChannelModel
+Line 408 
 public class DefaultSamplerChannelModel
           * device of the channel represented by this model.
           * @param deviceId Specifies the numerical ID of the audio output device to be set.
           */
+         @Override
          public void
          setBackendAudioOutputDevice(int deviceId) {
                  final Task scaod = new Channel.SetAudioOutputDevice(getChannelId(), deviceId);
-Line 417 
 public class DefaultSamplerChannelModel
+Line 437 
 public class DefaultSamplerChannelModel
           * @param audioDst The audio channel of the selected audio output device
           * where <code>audioSrc</code> should be routed to.
           */
+         @Override
          public void
          setBackendAudioOutputChannel(int audioSrc, int audioDst) {
                  final Task t;
-Line 444 
 public class DefaultSamplerChannelModel
+Line 465 
 public class DefaultSamplerChannelModel
           * map that should be assigned to this sampler
           * channel or <code>-1</code> to remove the current map binding.
           */
+         @Override
          public void
          setBackendMidiInstrumentMap(int mapId) {
                  final Task t = new Channel.SetMidiInstrumentMap(getChannelId(), mapId);
-Line 469 
 public class DefaultSamplerChannelModel
+Line 491 
 public class DefaultSamplerChannelModel
           * @param filename The file name of the instrument to be loaded.
           * @param InstrIndex The index of the instrument in the instrument file to be loaded.
           */
+         @Override
          public void
          loadBackendInstrument(String filename, int InstrIndex) {
                  final Task li = new LoadInstrument(filename, InstrIndex, getChannelId());
-Line 478 
 public class DefaultSamplerChannelModel
+Line 501 
 public class DefaultSamplerChannelModel
          }
          /** Schedules a new task for reseting the channel. */
+         @Override
          public void
          resetBackendChannel() {
                  CC.getTaskQueue().add(new org.jsampler.task.Channel.Reset(getChannelId()));
-Line 486 
 public class DefaultSamplerChannelModel
+Line 510 
 public class DefaultSamplerChannelModel
          }
          /** Schedules a new task for duplicating the channel. */
+         @Override
          public void
          duplicateBackendChannel() {
                  CC.getTaskQueue().add(new DuplicateChannels(getChannelInfo()));
-Line 498 
 public class DefaultSamplerChannelModel
+Line 523 
 public class DefaultSamplerChannelModel
           * @param midiCtrl Defines the MIDI controller, which
           * will be able alter the effect send level.
           */
+         @Override
          public void
          addBackendFxSend(int midiCtrl) {
                  CC.getTaskQueue().add(new Channel.AddFxSend(getChannelId(), midiCtrl));
-Line 513 
 public class DefaultSamplerChannelModel
+Line 539 
 public class DefaultSamplerChannelModel
           * @param name The name of the effect send entity.
           * The name does not have to be unique.
           */
+         @Override
          public void
          addBackendFxSend(int midiCtrl, String name) {
                  CC.getTaskQueue().add(new Channel.AddFxSend(getChannelId(), midiCtrl, name));
-Line 523 
 public class DefaultSamplerChannelModel
+Line 550 
 public class DefaultSamplerChannelModel
           * Adds the specified effect send.
           * @param fxSend The effect send to be added.
           */
+         @Override
          public void
          addFxSend(FxSend fxSend) {
                  fxSends.add(fxSend);
-Line 533 
 public class DefaultSamplerChannelModel
+Line 561 
 public class DefaultSamplerChannelModel
           * Schedules a new task for removing the specified effect send on the backend side.
           * @param fxSendId The ID of the effect send to remove.
           */
+         @Override
          public void
          removeBackendFxSend(int fxSendId) {
                  CC.getTaskQueue().add(new Channel.RemoveFxSend(getChannelId(), fxSendId));
-Line 543 
 public class DefaultSamplerChannelModel
+Line 572 
 public class DefaultSamplerChannelModel
           * @param index The index of the effect send to be returned.
           * @return The effect send at the specified position.
           */
+         @Override
          public FxSend
          getFxSend(int index) { return fxSends.get(index); }
-Line 552 
 public class DefaultSamplerChannelModel
+Line 582 
 public class DefaultSamplerChannelModel
           * @return The effect send with the specified ID or <code>null</code>
           * if there is no effect send with ID <code>fxSendId</code>.
           */
+         @Override
          public FxSend
          getFxSendById(int fxSendId) {
                  for(FxSend fxs : fxSends) {
-Line 566 
 public class DefaultSamplerChannelModel
+Line 597 
 public class DefaultSamplerChannelModel
           * @param index The position of the effect send to remove.
           * @return The removed effect send.
           */
+         @Override
          public FxSend
          removeFxSend(int index) {
                  FxSend fxs = fxSends.remove(index);
-Line 579 
 public class DefaultSamplerChannelModel
+Line 611 
 public class DefaultSamplerChannelModel
           * @return <code>true</code> if the effect send is removed successfully, <code>false</code>
           * if the channel does not contain effect send with ID <code>fxSendId</code>.
           */
+         @Override
          public boolean
          removeFxSendById(int fxSendId) {
                  for(int i = 0; i < fxSends.size(); i++) {
-Line 594 
 public class DefaultSamplerChannelModel
+Line 627 
 public class DefaultSamplerChannelModel
          }
          /** Removes all effect sends from this channel. */
+         @Override
          public void
          removeAllFxSends() {
                  for(int i = fxSends.size() - 1; i >= 0; i--) {
-Line 607 
 public class DefaultSamplerChannelModel
+Line 641 
 public class DefaultSamplerChannelModel
           * Updates the specified effect send.
           * @param fxSend The effect send to update.
           */
+         @Override
          public void
          updateFxSend(FxSend fxSend) {
                  for(int i = 0; i < fxSends.size(); i++) {
-Line 623 
 public class DefaultSamplerChannelModel
+Line 658 
 public class DefaultSamplerChannelModel
           * Gets the current number of effect sends.
           * @return The current number of effect sends.
           */
+         @Override
          public int
          getFxSendCount() { return fxSends.size(); }
-Line 630 
 public class DefaultSamplerChannelModel
+Line 666 
 public class DefaultSamplerChannelModel
           * Gets the current list of effect sends.
           * @return The current list of effect sends.
           */
+         @Override
          public FxSend[]
          getFxSends() { return fxSends.toArray(new FxSend[fxSends.size()]); }
-Line 638 
 public class DefaultSamplerChannelModel
+Line 675 
 public class DefaultSamplerChannelModel
           * @param fxSend The numerical ID of the effect send.
           * @param name The new name of the effect send entity.
           */
+         @Override
          public void
          setBackendFxSendName(final int fxSend, String name) {
                  final Task t = new Channel.SetFxSendName(getChannelId(), fxSend, name);
-Line 665 
 public class DefaultSamplerChannelModel
+Line 703 
 public class DefaultSamplerChannelModel
           * @param audioDst The audio channel of the selected audio output device
           * where <code>audioSrc</code> should be routed to.
           */
+         @Override
          public void
          setBackendFxSendAudioOutputChannel(int fxSend, int audioSrc, int audioDst) {
                  Task t = new Channel.SetFxSendAudioOutputChannel (
-Line 680 
 public class DefaultSamplerChannelModel
+Line 719 
 public class DefaultSamplerChannelModel
           * @param midiCtrl The MIDI controller which shall be
           * able to modify the effect send's send level.
           */
+         @Override
          public void
          setBackendFxSendMidiController(int fxSend, int midiCtrl) {
                  Task t = new Channel.SetFxSendMidiController(getChannelId(), fxSend, midiCtrl);
-Line 692 
 public class DefaultSamplerChannelModel
+Line 732 
 public class DefaultSamplerChannelModel
           * send, which volume should be changed.
           * @param level The new volume value.
           */
+         @Override
          public void
          setBackendFxSendLevel(int fxSend, float level) {
                  CC.getTaskQueue().add(new Channel.SetFxSendLevel(getChannelId(), fxSend, level));
-Line 700 
 public class DefaultSamplerChannelModel
+Line 741 
 public class DefaultSamplerChannelModel
          /**
           * Sends a MIDI data message to this sampler channel.
           */
+         @Override
          public void
          sendBackendMidiData(MidiDataEvent e) {
                  sendBackendMidiData(e.getType(), e.getNote(), e.getVelocity());
-Line 711 
 public class DefaultSamplerChannelModel
+Line 753 
 public class DefaultSamplerChannelModel
           * @param arg1 Depends on the message type.
           * @param arg2 Depends on the message type.
           */
+         @Override
          public void
          sendBackendMidiData(MidiDataEvent.Type type, int arg1, int arg2) {
                  CC.getTaskQueue().add(new Channel.SendMidiMsg(getChannelId(), type, arg1, arg2));
-Line 720 
 public class DefaultSamplerChannelModel
+Line 763 
 public class DefaultSamplerChannelModel
           * Sets destination effect on the specified effect send.
           * @param fxSend The numerical ID of the effect send.
           */
+         @Override
          public void
          setBackendFxSendEffect(int fxSend, int chainId, int chainPos) {
                  CC.getTaskQueue().add (
-Line 731 
 public class DefaultSamplerChannelModel
+Line 775 
 public class DefaultSamplerChannelModel
           * Removes the destination effect of the specified effect send.
           * @param fxSend The numerical ID of the effect send.
           */
+         @Override
          public void
          removeBackendFxSendEffect(int fxSend) {
                  CC.getTaskQueue().add (
-Line 743 
 public class DefaultSamplerChannelModel
+Line 788 
 public class DefaultSamplerChannelModel
          fireSamplerChannelChanged() {
                  final SamplerChannelEvent e = new SamplerChannelEvent(this);
-                 SwingUtilities.invokeLater(new Runnable() {
+                 PDUtils.runOnUiThread(new Runnable() {
                          public void
                          run() { fireSamplerChannelChanged(e); }
                  });
-Line 751 
 public class DefaultSamplerChannelModel
+Line 796 
 public class DefaultSamplerChannelModel
          /**
           * Notifies listeners that the sampler channel settings has changed.
-          * This method should be invoked from the event-dispatching thread.
+          * This method should be invoked from the UI thread.
           */
          protected void
          fireSamplerChannelChanged(SamplerChannelEvent e) {
-Line 764 
 public class DefaultSamplerChannelModel
+Line 809 
 public class DefaultSamplerChannelModel
          fireStreamCountChanged() {
                  final SamplerChannelEvent e = new SamplerChannelEvent(this);
-                 SwingUtilities.invokeLater(new Runnable() {
+                 PDUtils.runOnUiThread(new Runnable() {
                          public void
                          run() { fireStreamCountChanged(e); }
                  });
-Line 772 
 public class DefaultSamplerChannelModel
+Line 817 
 public class DefaultSamplerChannelModel
          /**
           * Notifies listeners that the number of active disk streams has changed.
-          * This method should be invoked from the event-dispatching thread.
+          * This method should be invoked from the UI thread.
           */
          protected void
          fireStreamCountChanged(SamplerChannelEvent e) {
-Line 784 
 public class DefaultSamplerChannelModel
+Line 829 
 public class DefaultSamplerChannelModel
          fireVoiceCountChanged() {
                  final SamplerChannelEvent e = new SamplerChannelEvent(this);
-                 SwingUtilities.invokeLater(new Runnable() {
+                 PDUtils.runOnUiThread(new Runnable() {
                          public void
                          run() { fireVoiceCountChanged(e); }
                  });
-Line 792 
 public class DefaultSamplerChannelModel
+Line 837 
 public class DefaultSamplerChannelModel
          /**
           * Notifies listeners that the number of active voices has changed.
-          * This method should be invoked from the event-dispatching thread.
+          * This method should be invoked from the UI thread.
           */
          protected void
          fireVoiceCountChanged(SamplerChannelEvent e) {
-Line 806 
 public class DefaultSamplerChannelModel
+Line 851 
 public class DefaultSamplerChannelModel
          fireFxSendAdded(FxSend fxSend) {
                  final EffectSendsEvent e = new EffectSendsEvent(this, fxSend);
-                 SwingUtilities.invokeLater(new Runnable() {
+                 PDUtils.runOnUiThread(new Runnable() {
                          public void
                          run() { fireFxSendAdded(e); }
                  });
-Line 814 
 public class DefaultSamplerChannelModel
+Line 859 
 public class DefaultSamplerChannelModel
          /**
           * Notifies listeners that the specified effect send has been added to the channel.
-          * This method should be invoked from the event-dispatching thread.
+          * This method should be invoked from the UI thread.
           */
          protected void
          fireFxSendAdded(EffectSendsEvent e) {
-Line 827 
 public class DefaultSamplerChannelModel
+Line 872 
 public class DefaultSamplerChannelModel
          fireFxSendRemoved(FxSend fxSend) {
                  final EffectSendsEvent e = new EffectSendsEvent(this, fxSend);
-                 SwingUtilities.invokeLater(new Runnable() {
+                 PDUtils.runOnUiThread(new Runnable() {
                          public void
                          run() { fireFxSendRemoved(e); }
                  });
-Line 835 
 public class DefaultSamplerChannelModel
+Line 880 
 public class DefaultSamplerChannelModel
          /**
           * Notifies listeners that the specified effect send has been removed.
-          * This method should be invoked from the event-dispatching thread.
+          * This method should be invoked from the UI thread.
           */
          protected void
          fireFxSendRemoved(EffectSendsEvent e) {
-Line 848 
 public class DefaultSamplerChannelModel
+Line 893 
 public class DefaultSamplerChannelModel
          fireFxSendUpdated(FxSend fxSend) {
                  final EffectSendsEvent e = new EffectSendsEvent(this, fxSend);
-                 SwingUtilities.invokeLater(new Runnable() {
+                 PDUtils.runOnUiThread(new Runnable() {
                          public void
                          run() { fireFxSendUpdated(e); }
                  });
-Line 856 
 public class DefaultSamplerChannelModel
+Line 901 
 public class DefaultSamplerChannelModel
          /**
           * Notifies listeners that the specified effect send has been updated.
-          * This method should be invoked from the event-dispatching thread.
+          * This method should be invoked from the UI thread.
           */
          protected void
          fireFxSendUpdated(EffectSendsEvent e) {

 Legend:



Removed from v.2287
 


changed lines


 
Added in v.2288
 Legend:



Removed from v.2287
 


changed lines


 
Added in v.2288
-Removed from v.2287
+Added in v.2288

	ViewVC Help
Powered by ViewVC