Author: solomax
Date: Wed Jan 22 14:47:17 2014
New Revision: 1560365
URL: http://svn.apache.org/r1560365
Log:
[OPENMEETINGS-870] RecordingPage is fixed
Modified:
openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/converter/BaseConverter.java
openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/remote/FLVRecorderService.java
openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/user/record/VideoInfo.java
Modified:
openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/converter/BaseConverter.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/converter/BaseConverter.java?rev=1560365&r1=1560364&r2=1560365&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/converter/BaseConverter.java
(original)
+++
openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/converter/BaseConverter.java
Wed Jan 22 14:47:17 2014
@@ -27,6 +27,7 @@ import static org.apache.openmeetings.ut
import java.io.File;
import java.io.IOException;
+import java.util.ArrayList;
import java.util.List;
import org.apache.openmeetings.db.dao.basic.ConfigurationDao;
@@ -89,43 +90,36 @@ public abstract class BaseConverter {
}
}
- protected String[] mergeAudioToWaves(List<String> listOfFullWaveFiles,
String outputFullWav) throws Exception {
- String[] argv_full_sox = new String[listOfFullWaveFiles.size()
+ 3];
+ protected String[] mergeAudioToWaves(List<String> listOfFullWaveFiles,
String outputFullWav) {
+ List<String> argv = new ArrayList<String>();
- log.debug(" listOfFullWaveFiles " + listOfFullWaveFiles.size()
+ " argv_full_sox LENGTH " + argv_full_sox.length);
-
- argv_full_sox[0] = getPathToSoX();
- argv_full_sox[1] = "-m";
-
- int i = 0;
- for (;i < listOfFullWaveFiles.size(); i++) {
- log.debug(" i "+i+" = "+listOfFullWaveFiles.get(i));
- argv_full_sox[2 + i] = listOfFullWaveFiles.get(i);
+ argv.add(getPathToSoX());
+ argv.add("-m");
+ for (String arg : listOfFullWaveFiles) {
+ argv.add(arg);
}
- log.debug(" i + 2 "+(i+2)+" "+outputFullWav);
-
- argv_full_sox[i + 2] = outputFullWav;
+ argv.add(outputFullWav);
- return argv_full_sox;
+ return argv.toArray(new String[0]);
}
protected void stripAudioFirstPass(FlvRecording flvRecording,
List<ConverterProcessResult> returnLog,
- List<String> listOfFullWaveFiles, File streamFolder)
throws Exception {
- List<FlvRecordingMetaData> metaDataList =
metaDataDao.getAudioMetaDataByRecording(flvRecording.getFlvRecordingId());
- stripAudioFirstPass(flvRecording, returnLog,
listOfFullWaveFiles, streamFolder, metaDataList);
+ List<String> listOfFullWaveFiles, File streamFolder)
+ {
+ stripAudioFirstPass(flvRecording, returnLog,
listOfFullWaveFiles, streamFolder
+ ,
metaDataDao.getAudioMetaDataByRecording(flvRecording.getFlvRecordingId()));
}
- private String[] addSoxPad(List<ConverterProcessResult> returnLog,
String job, double length, double position, String inFile, String outFile) {
+ private String[] addSoxPad(List<ConverterProcessResult> returnLog,
String job, double length, double position,
+ String inFile, String outFile) {
if (length >= 0 && position >= 0 && (length > 0 || position >
0)) {
- String[] argv = new String[] { getPathToSoX(),
- inFile, outFile, "pad",
- "" + length, "" + position };
-
+ String[] argv = new String[] { getPathToSoX(), inFile,
outFile, "pad", "" + length, "" + position };
+
returnLog.add(ProcessHelper.executeScript(job, argv));
return argv;
} else {
- log.debug("::addSoxPad " + job + " Invalid parameters: "
- + " length = " + length + "; position = " +
position + "; inFile = " + inFile);
+ log.debug("::addSoxPad " + job + " Invalid parameters:
" + " length = " + length + "; position = "
+ + position + "; inFile = " + inFile);
}
return null;
}
Modified:
openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/remote/FLVRecorderService.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/remote/FLVRecorderService.java?rev=1560365&r1=1560364&r2=1560365&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/remote/FLVRecorderService.java
(original)
+++
openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/remote/FLVRecorderService.java
Wed Jan 22 14:47:17 2014
@@ -308,10 +308,10 @@ public class FLVRecorderService implemen
// in the FlvRecorderConverter waiting for the
stream to finish
// this would normally happen in the Listener
FlvRecordingMetaData metaData =
metaDataDao.get(flvRecordingMetaDataId);
- if (metaData.getStreamStatus() !=
Status.STOPPING) {
+ if (metaData.getStreamStatus() ==
Status.STARTED) {
metaData.setStreamStatus(Status.STOPPED);
+ metaDataDao.update(metaData);
}
- metaDataDao.update(metaData);
throw new IllegalStateException("Could not find
Listener to stop! flvRecordingMetaDataId " + flvRecordingMetaDataId);
} else {
FlvRecordingMetaData metaData =
metaDataDao.get(flvRecordingMetaDataId);
Modified:
openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/user/record/VideoInfo.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/user/record/VideoInfo.java?rev=1560365&r1=1560364&r2=1560365&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/user/record/VideoInfo.java
(original)
+++
openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/user/record/VideoInfo.java
Wed Jan 22 14:47:17 2014
@@ -35,7 +35,7 @@ import org.apache.wicket.util.resource.F
public class VideoInfo extends Panel {
private static final long serialVersionUID = 1L;
- private final static WebMarkupContainer container = new
WebMarkupContainer("container");
+ private final WebMarkupContainer container = new
WebMarkupContainer("container");
private final Button dAVI = new Button("dAVI");
private final Button dFLV = new Button("dFLV");
private final AjaxDownload download = new AjaxDownload();
