Ticket #2120: bug#2120.patch

src/main/java/org/sophie2/main/media/natlib/decoder/MediaNativeBridge.java

@@ -5 +5 @@
 import org.sophie2.base.commons.util.ImmImage;
 import org.sophie2.base.media.AudioChunk;
 import org.sophie2.base.natlib.Command;
+import org.sophie2.base.natlib.ErrorResponse;
 import org.sophie2.base.natlib.NativeBridge;
 import org.sophie2.base.natlib.OkResponse;
 import org.sophie2.base.natlib.Response;
@@ -49 +50 @@
         @Override
         public void start() {
                 super.start();
-                sendCommand(MediaMessages.createOpen(this.fileData.getSize()), OkResponse.class);
+                sendCommand(MediaMessages.createOpen(this.fileData.getSize()),
+                                OkResponse.class);
         }
 
         /**
@@ -76 +78 @@
         public AudioChunk getAudio(int millis) {
                 assert millis % AudioChunk.MILLIS_LEN == 0;
                 Command cmd = MediaMessages.createGetAudio(millis);
-                AudioResponse res = sendCommand(cmd, AudioResponse.class);
-                assert res.getPosMillis() == millis;
-                return res.getChunk();
+                try {
+                        AudioResponse res = sendCommand(cmd, AudioResponse.class);
+                        assert res.getPosMillis() == millis;
+                        return res.getChunk();
+                } catch (RuntimeException e) {
+                        return AudioChunk.SILENCE;
+                }
         }
 
         @Override
@@ -103 +109 @@
         }
 
         @Override
-        public final <T extends Response> T sendCommand(Command command, Class<T> expectedClass) {
+        public final <T extends Response> T sendCommand(Command command,
+                        Class<T> expectedClass) {
                 Response res = super.sendCommand(command, Response.class);
                 while (res instanceof RequestBytesResponse) {
                         res = sendBytes((RequestBytesResponse) res);
                 }
-                assert expectedClass.isInstance(res) : res + " is not " + expectedClass.getSimpleName();
+                if (ErrorResponse.class.isInstance(res)) {
+                        throw new RuntimeException(ErrorResponse.class.cast(res)
+                                        .getErrorMessage());
+                }
                 return expectedClass.cast(res);
         }
 
@@ -116 +126 @@
                 int size = requestBytesResponse.getBufferSize();
                 int pos = requestBytesResponse.getPosition();
                 BinData subData = this.fileData.getSub(pos, pos + size);
-                Response res = super.sendCommand(MediaMessages.createSendBytes(pos, subData),
-                                Response.class);
+                Response res = super.sendCommand(MediaMessages.createSendBytes(pos,
+                                subData), Response.class);
                 return res;
         }