Author: solomax
Date: Mon Aug 20 02:56:53 2012
New Revision: 1374900
URL: http://svn.apache.org/viewvc?rev=1374900&view=rev
Log:
OPENMEETINGS-402 String concatenations of File names is replaces with
File(parent, child)
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/flvrecord/converter/FlvInterviewConverter.java
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/flvrecord/converter/FlvInterviewConverter.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/flvrecord/converter/FlvInterviewConverter.java?rev=1374900&r1=1374899&r2=1374900&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/flvrecord/converter/FlvInterviewConverter.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/flvrecord/converter/FlvInterviewConverter.java
Mon Aug 20 02:56:53 2012
@@ -178,7 +178,7 @@ public class FlvInterviewConverter exten
// create default Audio to merge it.
// strip to content length
- String outputWav = streamFolderGeneral +
"one_second.wav";
+ File outputWav = new File(streamFolderGeneral,
"one_second.wav");
// Calculate delta at beginning
Long deltaTimeMilliSeconds =
flvRecording.getRecordEnd()
@@ -187,7 +187,7 @@ public class FlvInterviewConverter exten
.toString()) / 1000) - 1;
String[] argv_full_sox = new String[] {
this.getPathToSoX(),
- outputWav, outputFullWav,
"pad", "0",
+ outputWav.getCanonicalPath(),
outputFullWav, "pad", "0",
deltaPadding.toString() };
log.debug("START generateSampleAudio
################# ");
@@ -245,13 +245,12 @@ public class FlvInterviewConverter exten
}
// Default Image for empty interview video pods
- String defaultInterviewImage = streamFolderGeneral
- + "default_interview_image.png";
- File defaultInterviewImageFile = new
File(defaultInterviewImage);
+ File defaultInterviewImageFile = new
File(streamFolderGeneral, "default_interview_image.png");
if (!defaultInterviewImageFile.exists()) {
throw new Exception("defaultInterviewImageFile
does not exist!");
}
+ String defaultInterviewImage =
defaultInterviewImageFile.getCanonicalPath();
// Create Folder for the output Image Sequence
String outputImageMergedData = streamFolder +
"INTERVIEW_"
