Revision: 2832
Author: seba.wagner
Date: Tue Jan 26 05:46:46 2010
Log: Fixes Issue 1104
Fixes Issue 1103
http://code.google.com/p/openmeetings/source/detail?r=2832
Added:
/trunk/singlewebapp/WebContent/openmeetings/modules/lzrecordcontent/messageRecordingWin.lzx
Modified:
/trunk/singlewebapp/WebContent/WEB-INF/classes/logback.xml
/trunk/singlewebapp/WebContent/WEB-INF/red5-services/flvrecorderservice.service.xml
/trunk/singlewebapp/WebContent/openmeetings/base/functions.lzx
/trunk/singlewebapp/WebContent/openmeetings/modules/lzrecordcontent/contentviews/lzRecordingsViewBottom.lzx
/trunk/singlewebapp/WebContent/openmeetings/modules/lzrecordcontent/contentviews/lzRecordingsViewMain.lzx
/trunk/singlewebapp/WebContent/openmeetings/modules/lzrecordcontent/library.lzx
/trunk/singlewebapp/conf/debug.txt
/trunk/singlewebapp/server/red5/webapps/openmeetings/WEB-INF/red5-services/flvrecorderservice.service.xml
/trunk/singlewebapp/src/app/org/openmeetings/app/data/flvrecord/FlvRecordingLogDaoImpl.java
/trunk/singlewebapp/src/app/org/openmeetings/app/data/flvrecord/converter/FlvRecorderConverter.java
/trunk/singlewebapp/src/app/org/openmeetings/app/hibernate/beans/flvrecord/FlvRecording.java
/trunk/singlewebapp/src/app/org/openmeetings/app/remote/FLVRecorderService.java
=======================================
--- /dev/null
+++
/trunk/singlewebapp/WebContent/openmeetings/modules/lzrecordcontent/messageRecordingWin.lzx
Tue Jan 26 05:46:46 2010
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<library>
+
+<class name="messageRecordingWin" extends="guiPresenter" labelid="890"
y="100"
+ docking="true" resizeable="false" closable="true" width="400"
+ x="$once{ parent.width/2 - this.width/2 }" height="240">
+
+ <attribute name="error" value="" type="string" />
+ <attribute name="labelTitleId" value="0" type="number" />
+
+ <view x="4" resource="warning_icon_rsc" y="24" />
+
+ <labelText labelid="$once{ parent.labelTitleId }" y="24" x="30" />
+
+ <view x="2" width="${ parent.width - 4 }" clip="true"
+ y="48" height="$once{ parent.height-74
}">
+ <labelText text="$once{ parent.parent.error }" width="${
parent.width - 14 }"
+ multiline="true" resize="false" selectable="true" />
+ <vscrollbar />
+ </view>
+
+ <simpleLabelButton labelid="891" width="100"
onclick="this.parent.close();"
+ x="$once{ parent.width-104 }" y="$once{ parent.height-22 }"
/>
+
+</class>
+
+</library>
=======================================
--- /trunk/singlewebapp/WebContent/WEB-INF/classes/logback.xml Fri Jan 22
07:10:25 2010
+++ /trunk/singlewebapp/WebContent/WEB-INF/classes/logback.xml Tue Jan 26
05:46:46 2010
@@ -42,8 +42,8 @@
</Pattern>
</layout>
</appender>
- <root>
- <level value="DEBUG" />
+ <root>
+ <level value="ERROR" />
<appender-ref ref="CONSOLE" />
<appender-ref ref="FILE" />
<appender-ref ref="ERRORFILE" />
=======================================
---
/trunk/singlewebapp/WebContent/WEB-INF/red5-services/flvrecorderservice.service.xml
Wed Jan 13 12:59:26 2010
+++
/trunk/singlewebapp/WebContent/WEB-INF/red5-services/flvrecorderservice.service.xml
Tue Jan 26 05:46:46 2010
@@ -16,6 +16,7 @@
<property name="flvRecordingDaoImpl"
ref="openmeetings.FlvRecordingDaoImpl" />
<property name="flvRecordingMetaDataDaoImpl"
ref="openmeetings.FlvRecordingMetaDataDaoImpl" />
<property name="flvRecorderConverterTask"
ref="openmeetings.FlvRecorderConverterTask" />
+ <property name="flvRecordingLogDaoImpl"
ref="openmeetings.FlvRecordingLogDaoImpl" />
</bean>
<bean id="openmeetings.FlvRecordingDaoImpl"
=======================================
--- /trunk/singlewebapp/WebContent/openmeetings/base/functions.lzx Sat Nov
7 05:02:13 2009
+++ /trunk/singlewebapp/WebContent/openmeetings/base/functions.lzx Tue Jan
26 05:46:46 2010
@@ -234,6 +234,25 @@
if (m<10) m = "0"+m;
return d+'.'+mo+'.'+y+' '+h+':'+m;
}
+
+function parseDateToStringTimeSecunds(dateObj){
+ // if($debug) Debug.write("FUNC/parseDateToStringTime",dateObj);
+ if (dateObj==null) return "";
+ var d = dateObj.getDate();
+ if (d<10) d = "0"+d;
+ var mo = dateObj.getMonth()+1;
+ if (mo<10) mo = "0"+mo;
+ var y = dateObj.getFullYear();
+ if (y<10) y = "0"+y;
+ var h = dateObj.getHours();
+ if (h<10) h = "0"+h;
+ var m = dateObj.getMinutes();
+ if (m<10) m = "0"+m;
+ var s = dateObj.getSeconds();
+ if (s<10) s = "0"+s;
+ return d+'.'+mo+'.'+y+' '+h+':'+m+':'+s;
+}
+
function parseStringToDate(t){
// if($debug) Debug.write("FUNC/parseStringToDate",t);
if (t.length==10){
=======================================
---
/trunk/singlewebapp/WebContent/openmeetings/modules/lzrecordcontent/contentviews/lzRecordingsViewBottom.lzx
Tue Dec 29 12:56:35 2009
+++
/trunk/singlewebapp/WebContent/openmeetings/modules/lzrecordcontent/contentviews/lzRecordingsViewBottom.lzx
Tue Jan 26 05:46:46 2010
@@ -167,7 +167,7 @@
var xItem = Math.round((i*60)/this.pixelFactor);
- if ($debug) Debug.write("devisior ",i,xItem);
+ //if ($debug) Debug.write("devisior ",i,xItem);
new
lz.userActivityDevider(this.content._content.contentDevider,{
x:xItem,
=======================================
---
/trunk/singlewebapp/WebContent/openmeetings/modules/lzrecordcontent/contentviews/lzRecordingsViewMain.lzx
Tue Dec 29 12:56:35 2009
+++
/trunk/singlewebapp/WebContent/openmeetings/modules/lzrecordcontent/contentviews/lzRecordingsViewMain.lzx
Tue Jan 26 05:46:46 2010
@@ -27,39 +27,78 @@
<method name="setNewStream" args="recording">
<![CDATA[
- this.stopStream();
+ this.stopStream();
this.isPaused = false;
-
- this.recordingName = recording.fileHash;
- this.getStreamLength.doCall();
-
- this._content.initW = recording.flvWidth;
- this._content.initH = recording.flvHeight;
-
- var downloadurl
= 'http://'+canvas.rtmphostlocal+':'+canvas.red5httpport
-
+canvas.httpRootKey+'DownloadHandler?fileName='+recording.previewImage
-
+'&moduleName=lzRecorderApp&parentPath=&room_id='
- +'&sid='+canvas.sessionId;
-
- if($debug)
Debug.write("lzRecorder/downloadurl "+downloadurl);
-
-
this._content._preview.imagePreview.setAttribute("src",downloadurl)
-
- this._content._preview.bringToFront();
-
- this._content.setItemContraints(0);
-
- this.deltaInSeconds =
Math.round((recording.recordEnd.getTime() -
recording.recordStart.getTime())/1000);
-
- if ($debug)
Debug.write("deltaInSeconds ",this.deltaInSeconds);
-
- var minutes = Math.floor(this.deltaInSeconds/60);
-
- if ($debug) Debug.write("minutes ",minutes);
-
- var restSeconds = this.deltaInSeconds - ( minutes * 60 );
-
-
this._progress._progressbar._duration.setAttribute("text",minutes+"
min "+restSeconds+" sec");
+
+
+ var hasFailed = false;
+
+ var tLogString = "";
+ var headerMessage = "<br/>"+canvas.getLabelName(889);
+
+ //Check if recording is not yet completed or if it has
failed
+ for (var i = 0;i<recording.flvRecordingLog.length;i++) {
+
+ if (recording.flvRecordingLog[i].exitValue !=
"0") {
+
+ hasFailed = true;
+ tLogString += headerMessage
+ +
parseDateToStringTimeSecunds(recording.flvRecordingLog[i].inserted)
+ + '<br/>'
+ +
recording.flvRecordingLog[i].msgType
+ + '<br/>'
+ +
recording.flvRecordingLog[i].fullMessage
+ + '<br/>';
+
+ }
+
+ }
+
+ if (hasFailed) {
+
+ if ($debug) Debug.write("tLogString
"+tLogString);
+ //var tString =
canvas.getLabelName(887) + tLogString;
+
+ new
lz.messageRecordingWin(canvas,{error:tLogString,labelTitleId:887});
+
+ } else if (recording.previewImage != null &&
recording.previewImage != "") {
+
+ this.recordingName = recording.fileHash;
+ this.getStreamLength.doCall();
+
+ this._content.initW = recording.flvWidth;
+ this._content.initH = recording.flvHeight;
+
+ var downloadurl
= 'http://'+canvas.rtmphostlocal+':'+canvas.red5httpport
+
+canvas.httpRootKey+'DownloadHandler?fileName='+recording.previewImage
+
+'&moduleName=lzRecorderApp&parentPath=&room_id='
+ +'&sid='+canvas.sessionId;
+
+ if($debug)
Debug.write("lzRecorder/downloadurl "+downloadurl);
+
+
this._content._preview.imagePreview.setAttribute("src",downloadurl)
+
+ this._content._preview.bringToFront();
+
+ this._content.setItemContraints(0);
+
+ this.deltaInSeconds =
Math.round((recording.recordEnd.getTime() -
recording.recordStart.getTime())/1000);
+
+ if ($debug)
Debug.write("deltaInSeconds ",this.deltaInSeconds);
+
+ var minutes = Math.floor(this.deltaInSeconds/60);
+
+ if ($debug) Debug.write("minutes ",minutes);
+
+ var restSeconds = this.deltaInSeconds - ( minutes * 60
);
+
+
this._progress._progressbar._duration.setAttribute("text",minutes+"
min "+restSeconds+" sec");
+
+ } else {
+
+ new
lz.labelerrorPopup(canvas,{errorlabelid:887});
+
+ }
]]>
</method>
=======================================
---
/trunk/singlewebapp/WebContent/openmeetings/modules/lzrecordcontent/library.lzx
Tue Dec 29 12:56:35 2009
+++
/trunk/singlewebapp/WebContent/openmeetings/modules/lzrecordcontent/library.lzx
Tue Jan 26 05:46:46 2010
@@ -44,6 +44,7 @@
<resource name="file_explorer_folder_home_rsc"
src="resources/folder_home.png" />
<include href="baseChooseIconFLVView.lzx" />
+ <include href="messageRecordingWin.lzx" />
<include href="dynamicFLVName.lzx" />
<include href="dragItemFLVExplorer.lzx" />
<include href="lzRecordContent.lzx" />
=======================================
--- /trunk/singlewebapp/conf/debug.txt Thu Jan 21 07:19:17 2010
+++ /trunk/singlewebapp/conf/debug.txt Tue Jan 26 05:46:46 2010
@@ -1,6 +1,11 @@
-process-generateFFMPEG<br/>error-FFmpeg version UNKNOWN, Copyright (c)
2000-2007 Fabrice Bellard, et al. configuration: --prefix=/sw
--mandir=/sw/share/man --enable-shared --enable-gpl --enable-pp
--enable-swscaler --enable-pthreads --enable-x11grab --enable-liba52
--enable-libamr-nb --enable-libfaac --enable-libfaad --enable-libgsm
--enable-libmp3lame --enable-libtheora --enable-libvorbis --enable-libx264
--enable-libxvid --disable-mmx --disable-iwmmxt --disable-altivec
libavutil version: 49.6.0 libavcodec version: 51.49.0 libavformat
version: 52.2.0 built on Feb 14 2009 13:01:06, gcc: 4.0.1 (Apple Inc.
build 5465)
-
-/Users/sebastianwagner/Documents/workspaces/workspace_openmeetings/ROOT/dist/red5/./webapps/openmeetings/streams/5/rec_1_stream_18_21_01_2010_15_46_05.flv:
no
such file or directory<br/>
-
-
-command-[ffmpeg, -i,
/Users/sebastianwagner/Documents/workspaces/workspace_openmeetings/ROOT/dist/red5/./webapps/openmeetings/streams/5/rec_1_stream_18_21_01_2010_15_46_05.flv,
/Users/sebastianwagner/Documents/workspaces/workspace_openmeetings/ROOT/dist/red5/./webapps/openmeetings/streams/5/rec_1_stream_18_21_01_2010_15_46_05_WAVE.wav]<br/>exitValue-1<br/>
+process-generateFFMPEG<br/>error-FFmpeg version UNKNOWN, Copyright (c)
2000-2007 Fabrice Bellard, et al. configuration: --prefix=/sw
--mandir=/sw/share/man --enable-shared --enable-gpl --enable-pp
--enable-swscaler --enable-pthreads --enable-x11grab --enable-liba52
--enable-libamr-nb --enable-libfaac --enable-libfaad --enable-libgsm
--enable-libmp3lame --enable-libtheora --enable-libvorbis --enable-libx264
--enable-libxvid --disable-mmx --disable-iwmmxt --disable-altivec
libavutil version: 49.6.0 libavcodec version: 51.49.0 libavformat
version: 52.2.0 built on Feb 14 2009 13:01:06, gcc: 4.0.1 (Apple Inc.
build
5465)/Users/sebastianwagner/Documents/workspaces/workspace_openmeetings/ROOT/dist/red5/webapps/openmeetings/streams/5/rec_6_stream_20_25_01_2010_16_04_26.flv:
no such file or directory<br/>command-[ffmpeg, -i,
/Users/sebastianwagner/Documents/workspaces/workspace_openmeetings/ROOT/dist/red5/webapps/openmeetings/streams/5/rec_6_stream_20_25_01_2010_16_04_26.flv,
/Users/sebastianwagner/Documents/workspaces/workspace_openmeetings/ROOT/dist/red5/webapps/openmeetings/streams/5/rec_6_stream_20_25_01_2010_16_04_26_WAVE.wav]<br/>exitValue-1<br/>
+
+
+process-generateFFMPEG<br/>error-FFmpeg version UNKNOWN, Copyright (c)
2000-2007 Fabrice Bellard, et al. configuration: --prefix=/sw
--mandir=/sw/share/man --enable-shared --enable-gpl --enable-pp
--enable-swscaler --enable-pthreads --enable-x11grab --enable-liba52
--enable-libamr-nb --enable-libfaac --enable-libfaad --enable-libgsm
--enable-libmp3lame --enable-libtheora --enable-libvorbis --enable-libx264
--enable-libxvid --disable-mmx --disable-iwmmxt --disable-altivec
libavutil version: 49.6.0 libavcodec version: 51.49.0 libavformat
version: 52.2.0 built on Feb 14 2009 13:01:06, gcc: 4.0.1 (Apple Inc.
build
5465)/Users/sebastianwagner/Documents/workspaces/workspace_openmeetings/ROOT/dist/red5/webapps/openmeetings/streams/5/rec_6_stream_15_25_01_2010_16_01_47.flv:
no such file or directory<br/>command-[ffmpeg, -i,
/Users/sebastianwagner/Documents/workspaces/workspace_openmeetings/ROOT/dist/red5/webapps/openmeetings/streams/5/rec_6_stream_15_25_01_2010_16_01_47.flv,
/Users/sebastianwagner/Documents/workspaces/workspace_openmeetings/ROOT/dist/red5/webapps/openmeetings/streams/5/rec_6_stream_15_25_01_2010_16_01_47_WAVE.wav]<br/>exitValue-1<br/>
+
+
+
+ffmpeg -i
/Users/sebastianwagner/Documents/workspaces/workspace_openmeetings/ROOT/dist/red5/webapps/openmeetings/streams/5/rec_6_stream_15_25_01_2010_16_01_47.flv
/Users/sebastianwagner/Documents/workspaces/workspace_openmeetings/ROOT/dist/red5/webapps/openmeetings/streams/5/rec_6_stream_15_25_01_2010_16_01_47_WAVE.wav
+
+
+process-generateFFMPEG<br/>error-FFmpeg version UNKNOWN, Copyright (c)
2000-2007 Fabrice Bellard, et al. configuration: --prefix=/sw
--mandir=/sw/share/man --enable-shared --enable-gpl --enable-pp
--enable-swscaler --enable-pthreads --enable-x11grab --enable-liba52
--enable-libamr-nb --enable-libfaac --enable-libfaad --enable-libgsm
--enable-libmp3lame --enable-libtheora --enable-libvorbis --enable-libx264
--enable-libxvid --disable-mmx --disable-iwmmxt --disable-altivec
libavutil version: 49.6.0 libavcodec version: 51.49.0 libavformat
version: 52.2.0 built on Feb 14 2009 13:01:06, gcc: 4.0.1 (Apple Inc.
build
5465)/Users/sebastianwagner/Documents/workspaces/workspace_openmeetings/ROOT/dist/red5/webapps/openmeetings/streams/5/rec_6_stream_20_25_01_2010_16_04_26.flv:
no such file or directory<br/>command-[ffmpeg, -i,
/Users/sebastianwagner/Documents/workspaces/workspace_openmeetings/ROOT/dist/red5/webapps/openmeetings/streams/5/rec_6_stream_20_25_01_2010_16_04_26.flv,
/Users/sebastianwagner/Documents/workspaces/workspace_openmeetings/ROOT/dist/red5/webapps/openmeetings/streams/5/rec_6_stream_20_25_01_2010_16_04_26_WAVE.wav]<br/>exitValue-1<br/>
=======================================
---
/trunk/singlewebapp/server/red5/webapps/openmeetings/WEB-INF/red5-services/flvrecorderservice.service.xml
Wed Jan 13 12:59:26 2010
+++
/trunk/singlewebapp/server/red5/webapps/openmeetings/WEB-INF/red5-services/flvrecorderservice.service.xml
Tue Jan 26 05:46:46 2010
@@ -16,6 +16,7 @@
<property name="flvRecordingDaoImpl"
ref="openmeetings.FlvRecordingDaoImpl" />
<property name="flvRecordingMetaDataDaoImpl"
ref="openmeetings.FlvRecordingMetaDataDaoImpl" />
<property name="flvRecorderConverterTask"
ref="openmeetings.FlvRecorderConverterTask" />
+ <property name="flvRecordingLogDaoImpl"
ref="openmeetings.FlvRecordingLogDaoImpl" />
</bean>
<bean id="openmeetings.FlvRecordingDaoImpl"
=======================================
---
/trunk/singlewebapp/src/app/org/openmeetings/app/data/flvrecord/FlvRecordingLogDaoImpl.java
Mon Dec 28 10:03:26 2009
+++
/trunk/singlewebapp/src/app/org/openmeetings/app/data/flvrecord/FlvRecordingLogDaoImpl.java
Tue Jan 26 05:46:46 2010
@@ -3,12 +3,15 @@
import java.util.Date;
import java.util.HashMap;
import java.util.Iterator;
+import java.util.List;
import org.hibernate.HibernateException;
+import org.hibernate.Query;
import org.hibernate.Session;
import org.hibernate.Transaction;
import org.openmeetings.app.hibernate.beans.flvrecord.FlvRecording;
import org.openmeetings.app.hibernate.beans.flvrecord.FlvRecordingLog;
+import org.openmeetings.app.hibernate.beans.rooms.Rooms;
import org.openmeetings.app.hibernate.utils.HibernateUtil;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
@@ -28,6 +31,29 @@
return instance;
}
+ public List<FlvRecordingLog> getFLVRecordingLogByRecordingId(Long
flvRecordingId){
+ try {
+ String hql = "select c from FlvRecordingLog as c where
flvRecording.flvRecordingId = :flvRecordingId";
+
+ Object idf = HibernateUtil.createSession();
+ Session session = HibernateUtil.getSession();
+ Transaction tx = session.beginTransaction();
+ Query query = session.createQuery(hql);
+ query.setLong("flvRecordingId", flvRecordingId);
+ List<FlvRecordingLog> flvRecordingList = query.list();
+ tx.commit();
+ HibernateUtil.closeSession(idf);
+
+ return flvRecordingList;
+
+ } catch (HibernateException ex) {
+ log.error("[getFLVRecordingLogByRecordingId] ", ex);
+ } catch (Exception ex2) {
+ log.error("[getFLVRecordingLogByRecordingId] ", ex2);
+ }
+ return null;
+ }
+
public Long addFLVRecordingLog(String msgType, FlvRecording flvRecording,
HashMap<String, Object> returnMap) {
try {
@@ -66,4 +92,5 @@
}
return -1L;
}
-}
+
+}
=======================================
---
/trunk/singlewebapp/src/app/org/openmeetings/app/data/flvrecord/converter/FlvRecorderConverter.java
Thu Jan 21 07:19:17 2010
+++
/trunk/singlewebapp/src/app/org/openmeetings/app/data/flvrecord/converter/FlvRecorderConverter.java
Tue Jan 26 05:46:46 2010
@@ -144,29 +144,37 @@
String outputWav = streamFolderName +
hashFileName;
flvRecordingMetaData.setWavAudioData(hashFileName);
-
- String[] argv = new String[] { this.getPathToFFMPEG(),
"-i",
- inputFlv, outputWav };
-
- log.debug("START stripAudioFromFLVs
################# ");
- for (int i = 0; i < argv.length; i++) {
- //log.debug(" i " + i + " argv-i " +
argv[i]);
- }
- log.debug("END stripAudioFromFLVs #################
");
-
-
returnLog.add(GenerateSWF.executeScript("generateFFMPEG", argv));
-
- // check if the resulting Audio is valid
- File output_wav = new File(outputWav);
-
- if (!output_wav.exists()) {
-
flvRecordingMetaData.setAudioIsValid(false);
- } else {
- if (output_wav.length() == 0) {
+
+ File inputFlvFile = new File(inputFlv);
+
+ if (inputFlvFile.exists()) {
+
+ String[] argv = new String[] {
this.getPathToFFMPEG(), "-i",
+ inputFlv, outputWav };
+
+ log.debug("START stripAudioFromFLVs
################# ");
+ for (int i = 0; i < argv.length; i++) {
+ //log.debug(" i " + i + " argv-i
" + argv[i]);
+ }
+ log.debug("END stripAudioFromFLVs
################# ");
+
+
returnLog.add(GenerateSWF.executeScript("generateFFMPEG", argv));
+
+ // check if the resulting Audio is valid
+ File output_wav = new File(outputWav);
+
+ if (!output_wav.exists()) {
flvRecordingMetaData.setAudioIsValid(false);
} else {
-
flvRecordingMetaData.setAudioIsValid(true);
- }
+ if (output_wav.length() == 0) {
+
flvRecordingMetaData.setAudioIsValid(false);
+ } else {
+
flvRecordingMetaData.setAudioIsValid(true);
+ }
+ }
+
+ } else {
+
flvRecordingMetaData.setAudioIsValid(false);
}
if (flvRecordingMetaData.getAudioIsValid()) {
=======================================
---
/trunk/singlewebapp/src/app/org/openmeetings/app/hibernate/beans/flvrecord/FlvRecording.java
Sun Jan 17 07:43:00 2010
+++
/trunk/singlewebapp/src/app/org/openmeetings/app/hibernate/beans/flvrecord/FlvRecording.java
Tue Jan 26 05:46:46 2010
@@ -55,6 +55,7 @@
private List<FlvRecordingMetaData> flvRecordingMetaData;
private Users creator;
private Rooms room;
+ private List<FlvRecordingLog> flvRecordingLog;
/**
*
@@ -390,6 +391,12 @@
public void setAlternateDownload(String alternateDownload) {
this.alternateDownload = alternateDownload;
}
-
+
+ public List<FlvRecordingLog> getFlvRecordingLog() {
+ return flvRecordingLog;
+ }
+ public void setFlvRecordingLog(List<FlvRecordingLog> flvRecordingLog) {
+ this.flvRecordingLog = flvRecordingLog;
+ }
}
=======================================
---
/trunk/singlewebapp/src/app/org/openmeetings/app/remote/FLVRecorderService.java
Fri Jan 22 09:45:44 2010
+++
/trunk/singlewebapp/src/app/org/openmeetings/app/remote/FLVRecorderService.java
Tue Jan 26 05:46:46 2010
@@ -11,6 +11,7 @@
import org.openmeetings.app.data.basic.Sessionmanagement;
import org.openmeetings.app.data.conference.Roommanagement;
import org.openmeetings.app.data.flvrecord.FlvRecordingDaoImpl;
+import org.openmeetings.app.data.flvrecord.FlvRecordingLogDaoImpl;
import org.openmeetings.app.data.flvrecord.FlvRecordingMetaDataDaoImpl;
import org.openmeetings.app.data.flvrecord.beans.FLVRecorderObject;
import
org.openmeetings.app.data.flvrecord.converter.FlvRecorderConverterTask;
@@ -48,6 +49,7 @@
private UsersDaoImpl usersDaoImpl;
private Roommanagement roommanagement;
private FlvRecorderConverterTask flvRecorderConverterTask;
+ private FlvRecordingLogDaoImpl flvRecordingLogDaoImpl;
public void resultReceived(IPendingServiceCall arg0) {
// TODO Auto-generated method stub
@@ -97,6 +99,14 @@
FlvRecorderConverterTask flvRecorderConverterTask) {
this.flvRecorderConverterTask = flvRecorderConverterTask;
}
+
+ public FlvRecordingLogDaoImpl getFlvRecordingLogDaoImpl() {
+ return flvRecordingLogDaoImpl;
+ }
+ public void setFlvRecordingLogDaoImpl(
+ FlvRecordingLogDaoImpl flvRecordingLogDaoImpl) {
+ this.flvRecordingLogDaoImpl = flvRecordingLogDaoImpl;
+ }
public RoomClient checkForRecording(){
try {
@@ -560,6 +570,8 @@
if (flvRecording.getRoom_id() != null) {
flvRecording.setRoom(this.roommanagement.getRoomById(flvRecording.getRoom_id()));
}
+
+
flvRecording.setFlvRecordingLog(this.flvRecordingLogDaoImpl.getFLVRecordingLogByRecordingId(flvRecordingId));
return flvRecording;
--
You received this message because you are subscribed to the Google Groups
"OpenMeetings developers" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/openmeetings-dev?hl=en.
