diff -r 98ccebc37403 -r dc7c549001d5 javauis/mmapi_qt/baseline/javasrc/com/nokia/microedition/media/protocol/SourceStreamReader.java --- a/javauis/mmapi_qt/baseline/javasrc/com/nokia/microedition/media/protocol/SourceStreamReader.java Fri May 14 15:47:24 2010 +0300 +++ b/javauis/mmapi_qt/baseline/javasrc/com/nokia/microedition/media/protocol/SourceStreamReader.java Thu May 27 12:49:31 2010 +0300 @@ -29,7 +29,7 @@ public class SourceStreamReader extends Thread { - Thread t1 = null; + Thread t1 = null; // these states are the same in c++ side private static final int NO_ERROR = 0; private static final int ERR_GENERAL = -2; // KErrGeneral @@ -95,7 +95,7 @@ int length = 0; do { - Logger.LOG(Logger.EJavaMMAPI, Logger.EInfo,"Source stream reader run()"); + Logger.LOG(Logger.EJavaMMAPI, Logger.EInfo,"Source stream reader run()"); iStatus = MORE_DATA; try { @@ -103,11 +103,11 @@ } catch (IOException ioe) { - Logger.LOG(Logger.EJavaMMAPI, Logger.EInfo,"Source stream reader run(), io exception"); - ioe.printStackTrace(); + Logger.LOG(Logger.EJavaMMAPI, Logger.EInfo,"Source stream reader run(), io exception"); + ioe.printStackTrace(); iStatus = ERR_GENERAL; } - Logger.LOG(Logger.EJavaMMAPI, Logger.EInfo,"Source stream reader run(), length = "+length); + Logger.LOG(Logger.EJavaMMAPI, Logger.EInfo,"Source stream reader run(), length = "+length); if (iStatus == CLOSED) { return; @@ -115,39 +115,39 @@ // no more data because end of file has been reach if (length == -1) { - Logger.LOG(Logger.EJavaMMAPI, Logger.EInfo,"no more data because end of file has been reach"); + Logger.LOG(Logger.EJavaMMAPI, Logger.EInfo,"no more data because end of file has been reach"); iStatus = COMPLETED; } - // synchronized (iWaitObject) - // { - Logger.LOG(Logger.EJavaMMAPI, Logger.EInfo,"Source stream reader run(), calling jni _write"+"status =" + iStatus + "length =" + length); + // synchronized (iWaitObject) + // { + Logger.LOG(Logger.EJavaMMAPI, Logger.EInfo,"Source stream reader run(), calling jni _write"+"status =" + iStatus + "length =" + length); - int err = _write(iHandle, - iEventSourceHandle, - iBuffer, - length, - iStatus, - iPlayerHandle); - Logger.LOG(Logger.EJavaMMAPI, Logger.EInfo,"Source stream reader run(), calling jni _write ret = "+err); - if (err != 0) - { - // error in writing, closing thread - iIsActive = false; - iStatus = CLOSED; - break; - } - // wait for next native read - // try - // { - Logger.LOG(Logger.EJavaMMAPI, Logger.EInfo,"Source stream reader run(), calling wait()"); - Logger.LOG(Logger.EJavaMMAPI, Logger.EInfo,"Source stream reader run(), calling wait() thread is =" +Thread.currentThread().getName()); - // iWaitObject.wait(); - //} - /*catch (InterruptedException ex) - { - // MIDP's object does not have interrupt - }*/ - // } + int err = _write(iHandle, + iEventSourceHandle, + iBuffer, + length, + iStatus, + iPlayerHandle); + Logger.LOG(Logger.EJavaMMAPI, Logger.EInfo,"Source stream reader run(), calling jni _write ret = "+err); + if (err != 0) + { + // error in writing, closing thread + iIsActive = false; + iStatus = CLOSED; + break; + } + // wait for next native read + // try + // { + Logger.LOG(Logger.EJavaMMAPI, Logger.EInfo,"Source stream reader run(), calling wait()"); + Logger.LOG(Logger.EJavaMMAPI, Logger.EInfo,"Source stream reader run(), calling wait() thread is =" +Thread.currentThread().getName()); + // iWaitObject.wait(); + //} + /*catch (InterruptedException ex) + { + // MIDP's object does not have interrupt + }*/ + // } } while (length>0); } @@ -252,17 +252,17 @@ Logger.LOG(Logger.EJavaMMAPI, Logger.EInfo,"SourceStreamReader:: read() before sync(iWaitObjet() "); synchronized (iWaitObject) { - Logger.LOG(Logger.EJavaMMAPI, Logger.EInfo,"SourceStreamReader:: read() notifying iWaitObject"); - iWaitObject.notify(); + Logger.LOG(Logger.EJavaMMAPI, Logger.EInfo,"SourceStreamReader:: read() notifying iWaitObject"); + iWaitObject.notify(); } } else { - Logger.LOG(Logger.EJavaMMAPI, Logger.EInfo,"SourceStreamReader, creating new Thread"); + Logger.LOG(Logger.EJavaMMAPI, Logger.EInfo,"SourceStreamReader, creating new Thread"); iIsActive = true; t1 = new Thread(this); t1.start(); - // start(); + // start(); } }