video fixes

BobHanson · BobHanson · commit 861d517725d0 · 2020-04-29T09:26:19.000-05:00
diff --git a/sources/net.sf.j2s.java.core/src/swingjs/api/js/HTML5Video.java b/sources/net.sf.j2s.java.core/src/swingjs/api/js/HTML5Video.java
@@ -231,6 +231,7 @@ public static Object[] addActionListener(HTML5Video jsvideo, ActionListener list
 			public Void apply(Object jsevent) {
 				String name = (/** @j2sNative jsevent.type || */
 				"?");
+				System.out.println("HTML5Video " + name);
 				ActionEvent e = new ActionEvent(new Object[] { jsvideo, jsevent }, 12345, name,
 						System.currentTimeMillis(), 0);
 				listener.actionPerformed(e);
@@ -258,7 +259,6 @@ public Void apply(Object jsevent) {
 	 * @param listeners an array of event/listener pairs created by
 	 *                  addActionListener
 	 */
-	@SuppressWarnings("unused")
 	public static void removeActionListener(HTML5Video jsvideo, Object[] listeners) {
 		if (listeners == null) {
 			for (int i = 0; i < eventTypes.length; i++) {
@@ -314,7 +314,7 @@ public static JLabel createLabel(Object source) {
 	 * @param maxWidth
 	 * @return
 	 */
-	public static JDialog createDialog(Frame parent, Object source, int maxWidth, Runnable whenReady) {
+	public static JDialog createDialog(Frame parent, Object source, int maxWidth, Function<HTML5Video, Void> whenReady) {
 		JDialog dialog = new JDialog(parent);
 		Container p = dialog.getContentPane();
 		p.setLayout(new BoxLayout(p, BoxLayout.Y_AXIS));
@@ -347,7 +347,7 @@ public void actionPerformed(ActionEvent e) {
 				dialog.pack();
 //				dialog.setVisible(false);
 				if (whenReady != null)
-					whenReady.run();
+					whenReady.apply(jsvideo);
 			}
 			
 		}, "canplaythrough");
@@ -427,6 +427,10 @@ public static boolean nextFrame(HTML5Video jsvideo, double dt) {
 		return canSeek.booleanValue();
 	}
 
+	public static int getFrameCount(HTML5Video jsvideo) {
+		return (int) (getDuration(jsvideo) / 0.033334);
+	}
+
 // HTMLMediaElement properties
 
 //	audioTracks
diff --git a/sources/net.sf.j2s.java.core/src/test/Test_Video.java b/sources/net.sf.j2s.java.core/src/test/Test_Video.java
@@ -18,6 +18,7 @@
 import java.nio.file.Files;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.function.Function;
 
 import javax.swing.BoxLayout;
 import javax.swing.ImageIcon;
@@ -33,7 +34,6 @@
 import javax.swing.WindowConstants;
 
 import swingjs.api.JSUtilI;
-import swingjs.api.js.DOMNode;
 import swingjs.api.js.HTML5Video;
 
 /**
@@ -105,11 +105,12 @@ public Test_Video() {
 		
 		// A little trick to allow "final" self reference in a Runnable parameter
 		JDialog[] dialog = new JDialog[1];
-		dialog[0] = HTML5Video.createDialog(null, label, 500, new Runnable() {
+		dialog[0] = HTML5Video.createDialog(null, label, 500, new Function<HTML5Video, Void>() {
 
 			@Override
-			public void run() {
+			public Void apply(HTML5Video video) {
 				dialog[0].setVisible(true);
+				return null;
 			}
 			
 		});
