From 2257280db433ea90f0d0cc2c32185a459f86c854 Mon Sep 17 00:00:00 2001 From: Simon Levitt Date: Fri, 4 Feb 2022 23:51:46 +0000 Subject: [PATCH] Fix audio playback within Simulator. --- .../impl/javase/cef/CEFBrowserComponent.java | 2 +- .../impl/javase/cef/InputStreamSchemeHandler.java | 14 +++++++------- .../codename1/impl/javase/cef/JavaCEFSEPort.java | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Ports/JavaSE/src/com/codename1/impl/javase/cef/CEFBrowserComponent.java b/Ports/JavaSE/src/com/codename1/impl/javase/cef/CEFBrowserComponent.java index 52f886d223..00ed84ede3 100644 --- a/Ports/JavaSE/src/com/codename1/impl/javase/cef/CEFBrowserComponent.java +++ b/Ports/JavaSE/src/com/codename1/impl/javase/cef/CEFBrowserComponent.java @@ -344,7 +344,7 @@ public void setPage(String html, String baseUrl) { String id = BrowserPanel.getStreamRegistry().registerStream(stream); - String url = "https://cn1app/streams/"+id; + String url = "cn1stream://stream/"+id; setURL(url); } catch (Exception ex) { setURL("data:text/html,"+com.codename1.io.Util.encodeUrl(html)); diff --git a/Ports/JavaSE/src/com/codename1/impl/javase/cef/InputStreamSchemeHandler.java b/Ports/JavaSE/src/com/codename1/impl/javase/cef/InputStreamSchemeHandler.java index 77a8a0df06..76c802b546 100644 --- a/Ports/JavaSE/src/com/codename1/impl/javase/cef/InputStreamSchemeHandler.java +++ b/Ports/JavaSE/src/com/codename1/impl/javase/cef/InputStreamSchemeHandler.java @@ -47,7 +47,7 @@ public InputStreamSchemeHandler() { } public static String getURL(String streamId) { - return scheme+"://"+domain+"/streams/"+streamId; + return scheme+"://streams/"+streamId; } private static final int LIMIT = 65536*2; private int written; @@ -133,7 +133,7 @@ public void getResponseHeaders( } - //response_length.set(-1); + response_length.set(-1); System.out.println("Set response length to "+response_length.get()); } else { @@ -180,7 +180,7 @@ public synchronized boolean readResponse( try { - if (stream.getStream().available() > 0) { + //if (stream.getStream().available() > 0) { System.out.println("Abbout to attempt reading "+bytes_to_read); int read = stream.getStream().read(data_out, 0, bytes_to_read > 0 ? Math.min(bytes_to_read, data_out.length) : data_out.length); @@ -204,12 +204,12 @@ public synchronized boolean readResponse( return true; } - } else { - System.out.println("No bytes available"); - bytes_read.set(0); + //} else { + //System.out.println("No bytes available"); + //bytes_read.set(0); - } + //} } catch (IOException ex) { Log.e(ex); } diff --git a/Ports/JavaSE/src/com/codename1/impl/javase/cef/JavaCEFSEPort.java b/Ports/JavaSE/src/com/codename1/impl/javase/cef/JavaCEFSEPort.java index 83fb4bc5dc..1aebc12a8c 100644 --- a/Ports/JavaSE/src/com/codename1/impl/javase/cef/JavaCEFSEPort.java +++ b/Ports/JavaSE/src/com/codename1/impl/javase/cef/JavaCEFSEPort.java @@ -614,7 +614,7 @@ public AsyncResource createMediaAsync(InputStream inputStream, String mim StreamWrapper stream = new StreamWrapper(inputStream, mimeType , -1); String id = BrowserPanel.getStreamRegistry().registerStream(stream); - String uriAddress = "https://cn1app/streams/"+id; + String uriAddress = "cn1stream://streams/"+id; try { new CodenameOneMediaPlayer(uriAddress, mimeType.startsWith("video/"), (JFrame)cnt, onCompletion, out); } catch (IOException ex) { @@ -660,7 +660,7 @@ public AsyncResource createMediaAsync(String uriAddress, boolean isVideo, StreamWrapper stream = new StreamWrapper(fis, getMimetype(f), f.length()); String id = BrowserPanel.getStreamRegistry().registerStream(stream); //uriAddress = InputStreamSchemeHandler.getURL(id); - uriAddress = "https://cn1app/streams/"+id; + uriAddress = "cn1stream://streams/"+id; //new CodenameOneMediaPlayer(stream, ((JFrame)cnt), onCompletion, out); } catch (IOException ex) { out.error(ex);