/ - Diff - Distorted Android

src/main/java/org/distorted/library/main/DistortedEffects.java
464	464	*/
465	465	public DistortedEffects()
466	466	{
467		android.util.Log.e("distEffects", "constr1");
468	467	mID = ++mNextID;
469	468	initializeEffectLists(this,0);
470	469	}
...	...
481	480	*/
482	481	public DistortedEffects(DistortedEffects dc, int flags)
483	482	{
484		android.util.Log.e("distEffects", "constr2");
485	483	mID = ++mNextID;
486	484	initializeEffectLists(dc,flags);
487	485	}

       private static final int DETACH = 1;
       private static final int DETALL = 2;
       protected int mNumEffects;
       protected int mNumEffects;      // 'ToBe' will be more than mNumEffects if doWork() hasn't
       protected int mNumEffectsToBe;  // added them yet (or less if it hasn't removed some yet)
       protected float[] mUniforms;
       protected long[] mCurrentDuration;
       protected Effect[] mEffects;
-...
       private ArrayList<DistortedNode> mNodes = null;
       private long mID;
       private int mNumEffectsToBe; // this will be more than mNumEffects if doWork hasn't really added them yet
       private static boolean mCreated;
       private int mIndex;
       private int mNumUniforms;
       private class Job
+        {
         int type;
         int index;
         boolean notify;
         Effect effect;
         Job(int t, int i, boolean n, Effect e)
         Job(int t, boolean n, Effect e)
+          {
           type  = t;
           index = i;
           notify= n;
           effect= e;
+          }
-...
         mNumEffectsToBe     = 0;
         mDistortedEffectsID = id;
         mIndex              = index;
         mNumUniforms        = numUniforms;
         int max = mMax[mIndex];
         if( max>0 )
+          {
           mUniforms        = new float[mNumUniforms*max];
           mUniforms        = new float[numUniforms*max];
           mCurrentDuration = new long[max];
           mEffects         = new Effect[max];
           mName            = new int[max];
-...
           mEffects[j]         = mEffects[j+1];
           mCurrentDuration[j] = mCurrentDuration[j+1];
           mName[j]            = mName[j+1];
           for(int k=0; k<mNumUniforms; k++)
             mUniforms[mNumUniforms*j+k] = mUniforms[mNumUniforms*(j+1)+k];
+          }
         mEffects[mNumEffects] = null;
-...
       synchronized int removeByName(EffectName name)
+        {
         int ret = 0;
         for(int i=0; i<mNumEffects; i++)
+          {
           if( mEffects[i].getName() == name )
+            {
             mJobs.add(new Job(DETACH,i,true,null));
             DistortedMaster.newSlave(this);
             mNumEffectsToBe--;
             return 1;
             mJobs.add(new Job(DETACH,true,mEffects[i]));
             ret++;
+            }
+          }
         return 0;
         if( ret>0 )
+          {
           DistortedMaster.newSlave(this);
           mNumEffectsToBe-=ret;
+          }
         return ret;
+        }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
-...
+          {
           if( mEffects[i].getID() == id )
+            {
             mJobs.add(new Job(DETACH,i,true,null));
             mJobs.add(new Job(DETACH,true,mEffects[i]));
             DistortedMaster.newSlave(this);
             mNumEffectsToBe--;
             return 1;
-...
+          {
           if( mEffects[i]==effect )
+            {
             mJobs.add(new Job(DETACH,i,true,null));
             mJobs.add(new Job(DETACH,true,mEffects[i]));
             DistortedMaster.newSlave(this);
             mNumEffectsToBe--;
             return 1;
-...
       synchronized int abortAll(boolean notify)
+        {
         mJobs.add(new Job(DETALL,0,notify,null));
         mJobs.add(new Job(DETALL,notify,null));
         DistortedMaster.newSlave(this);
         mNumEffectsToBe = 0;
         return mNumEffects;
-...
           //android.util.Log.e("queue", "scheduling future add of "+effect.getName().name()+" to "+mNumEffectsToBe+" id="+effect.getID());
           //android.util.Log.e("queue", "queue id="+mDistortedEffectsID);
           mJobs.add(new Job(ATTACH,mNumEffectsToBe,false,effect));
           mJobs.add(new Job(ATTACH,false,effect));
           DistortedMaster.newSlave(this);
           mNumEffectsToBe++;
           return true;
-...
           switch(job.type)
+            {
             case ATTACH: android.util.Log.e("queue", "DistortedEffects ID: "+mDistortedEffectsID+" bank:"+job.index+
                                             " attaching effectID="+job.effect.getID()+" ("+job.effect.getName().name()+")");
             case ATTACH: //android.util.Log.e("queue", "DisEffects ID: "+mDistortedEffectsID+" bank:"+mNumEffects+
                          //                   " attaching effectID="+job.effect.getID()+" ("+job.effect.getName().name()+")");
                          mCurrentDuration[job.index] = 0;
                          mEffects[job.index] = job.effect;
                          mName[job.index] = job.effect.getName().ordinal();
                          mCurrentDuration[mNumEffects] = 0;
                          mEffects[mNumEffects] = job.effect;
                          mName[mNumEffects] = job.effect.getName().ordinal();
                          mNumEffects++;
                          //android.util.Log.d("queue", "DisEffects ID: "+mDistortedEffectsID+
                          //        " success attaching, num to be:"+mNumEffectsToBe+" num:"+mNumEffects);
                          break;
             case DETACH: remove(job.index);
             case DETACH: //android.util.Log.e("queue", "DisEffects ID: "+mDistortedEffectsID+" detaching effect "+
                          //                             job.effect.getID());
                          for(int j=0; j<mNumEffects; j++)
+                           {
                            if (mEffects[j] == job.effect)
+                             {
                              remove(j);
                              //android.util.Log.d("queue", "DisEffects ID: "+mDistortedEffectsID+
                              //    " success detaching, num to be:"+mNumEffectsToBe+" num:"+mNumEffects);
                              break;
+                             }
+                           }
                          break;
             case DETALL: for(int j=0; j<mNumEffects; j++ )
+                           {

src/main/java/org/distorted/library/main/EffectQueueFragment.java
71	71	if( mEffects[i].isUnity( mUniforms, NUM_UNIFORMS*i) )
72	72	{
73	73	remove(i--);
	74	mNumEffectsToBe--;
74	75	continue;
75	76	}
76	77	}

src/main/java/org/distorted/library/main/EffectQueueMatrix.java
302	302	EffectMessageSender.newMessage( mListeners.get(j), EffectMessage.EFFECT_FINISHED, mEffects[i].getID(), mDistortedEffectsID);
303	303
304	304	if( mEffects[i].isUnity( mUniforms, NUM_UNIFORMS*i) )
	305	{
305	306	remove(i--);
	307	mNumEffectsToBe--;
	308	}
306	309	}
307	310	}
308	311

src/main/java/org/distorted/library/main/EffectQueuePostprocess.java
192	192	if( mEffects[i].isUnity( mUniforms, NUM_UNIFORMS*i) )
193	193	{
194	194	remove(i--);
	195	mNumEffectsToBe--;
195	196	continue;
196	197	}
197	198	}

src/main/java/org/distorted/library/main/EffectQueueVertex.java
71	71	if( mEffects[i].isUnity( mUniforms, NUM_UNIFORMS*i) )
72	72	{
73	73	remove(i--);
	74	mNumEffectsToBe--;
74	75	continue;
75	76	}
76	77	}

Project

General

Profile

Distorted Android

Revision 6b0b4f60

Added by Leszek Koltunski over 8 years ago