|
From: Edward G. <eg...@us...> - 2006-12-28 21:36:05
|
Update of /cvsroot/fieldling/Fieldling/src/fieldling/mediaplayer In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv28669/src/fieldling/mediaplayer Modified Files: PanelPlayer.java QT4JPlayer.java Log Message: highlighting problem should be fixed, plus FixMedia function should now work within THDLReadOnly Index: PanelPlayer.java =================================================================== RCS file: /cvsroot/fieldling/Fieldling/src/fieldling/mediaplayer/PanelPlayer.java,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** PanelPlayer.java 1 Dec 2006 14:44:34 -0000 1.12 --- PanelPlayer.java 28 Dec 2006 21:35:59 -0000 1.13 *************** *** 74,80 **** private void fireStartAnnotation(String id) { - - System.out.println("firing start annotation for id = " + id); - //see javadocs on EventListenerList for how following array is structured Object[] listeners = listenerList.getListenerList(); --- 74,77 ---- *************** *** 102,107 **** /*-----------------------------------------------------------------------*/ public void setAutoScrolling(boolean bool) { ! isAutoScrolling = bool; ! System.out.println(isAutoScrolling); } --- 99,103 ---- /*-----------------------------------------------------------------------*/ public void setAutoScrolling(boolean bool) { ! isAutoScrolling = bool; } *************** *** 316,320 **** String id = (String)pileEnd.peek(); Long f = (Long)hashEnd.get(id); ! if (when.longValue() > f.longValue()) { //if (when.longValue() >= f.longValue()) { //Integer f = (Integer)hashEnd.get(id); --- 312,316 ---- String id = (String)pileEnd.peek(); Long f = (Long)hashEnd.get(id); ! if (when.longValue() >= f.longValue()) { //if (when.longValue() >= f.longValue()) { //Integer f = (Integer)hashEnd.get(id); *************** *** 344,348 **** String id = (String)orderEndID.elementAt(i); Long f = (Long)hashEnd.get(id); ! if ((f.longValue() >= start.longValue()) && (f.longValue() <= end.longValue())) { //Integer f = (Integer)hashEnd.get(id); //if ((f.intValue() > start.intValue()) && (f.intValue() <= end.intValue())) { --- 340,344 ---- String id = (String)orderEndID.elementAt(i); Long f = (Long)hashEnd.get(id); ! if ((f.longValue() > start.longValue()) && (f.longValue() <= end.longValue())) { //Integer f = (Integer)hashEnd.get(id); //if ((f.intValue() > start.intValue()) && (f.intValue() <= end.intValue())) { *************** *** 358,363 **** Long f = (Long)hashStart.get(id); Long f2 = (Long)hashEnd.get(id); ! if ( (f.longValue() >= start.longValue() && f.longValue() <= end.longValue()) || ! (f.longValue() < start.longValue() && f2.longValue() >= start.longValue())) { //Integer f = (Integer)hashStart.get(id); //Integer f2 = (Integer)hashEnd.get(id); --- 354,359 ---- Long f = (Long)hashStart.get(id); Long f2 = (Long)hashEnd.get(id); ! if ( (f.longValue() >= start.longValue() && f.longValue() < end.longValue()) || ! (f.longValue() < start.longValue() && f2.longValue() > start.longValue())) { //Integer f = (Integer)hashStart.get(id); //Integer f2 = (Integer)hashEnd.get(id); Index: QT4JPlayer.java =================================================================== RCS file: /cvsroot/fieldling/Fieldling/src/fieldling/mediaplayer/QT4JPlayer.java,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** QT4JPlayer.java 22 Nov 2006 21:34:28 -0000 1.11 --- QT4JPlayer.java 28 Dec 2006 21:35:59 -0000 1.12 *************** *** 273,277 **** public long getCurrentTime() { try { ! return (controller.getCurrentTime() * 1000 / controller.getTimeScale()); //long myScale = movie.getTimeScale(); //long now = movie.getTime(); --- 273,280 ---- public long getCurrentTime() { try { ! // long t = controller.getCurrentTime() * 1000 / controller.getTimeScale(); ! // System.out.println("curr = " + new Long(t)); ! long curr = (long)controller.getCurrentTime(); ! return (curr * 1000 / controller.getTimeScale()); //long myScale = movie.getTimeScale(); //long now = movie.getTime(); |