Revision: 3131
Author: seba.wagner
Date: Sun Mar 7 15:21:49 2010
Log: Final Fix Interview Progress Window + Labels + Initial Setup of
interview room in default list
http://code.google.com/p/openmeetings/source/detail?r=3131
Modified:
/trunk/singlewebapp/WebContent/languages/arabic.xml
/trunk/singlewebapp/WebContent/languages/chinese simplified.xml
/trunk/singlewebapp/WebContent/languages/chinese traditional.xml
/trunk/singlewebapp/WebContent/languages/czech.xml
/trunk/singlewebapp/WebContent/languages/deutsch.xml
/trunk/singlewebapp/WebContent/languages/dutch.xml
/trunk/singlewebapp/WebContent/languages/english.xml
/trunk/singlewebapp/WebContent/languages/finnish.xml
/trunk/singlewebapp/WebContent/languages/french.xml
/trunk/singlewebapp/WebContent/languages/galician.xml
/trunk/singlewebapp/WebContent/languages/greek.xml
/trunk/singlewebapp/WebContent/languages/hebrew.xml
/trunk/singlewebapp/WebContent/languages/hungarian.xml
/trunk/singlewebapp/WebContent/languages/indonesian.xml
/trunk/singlewebapp/WebContent/languages/italian.xml
/trunk/singlewebapp/WebContent/languages/japanese.xml
/trunk/singlewebapp/WebContent/languages/korean.xml
/trunk/singlewebapp/WebContent/languages/persian.xml
/trunk/singlewebapp/WebContent/languages/polish.xml
/trunk/singlewebapp/WebContent/languages/portugues brazil.xml
/trunk/singlewebapp/WebContent/languages/portugues.xml
/trunk/singlewebapp/WebContent/languages/russian.xml
/trunk/singlewebapp/WebContent/languages/spanish.xml
/trunk/singlewebapp/WebContent/languages/swedish.xml
/trunk/singlewebapp/WebContent/languages/thai.xml
/trunk/singlewebapp/WebContent/languages/turkish.xml
/trunk/singlewebapp/WebContent/languages/ukrainian.xml
/trunk/singlewebapp/WebContent/lps/components/incubator/test/tooltipmanager-test.lzx
/trunk/singlewebapp/WebContent/openmeetings/modules/conference/video/editRecordStream.lzx
/trunk/singlewebapp/WebContent/openmeetings/modules/lzrecordcontent/contentviews/lzRecordingsViewMain.lzx
/trunk/singlewebapp/conf/debug.txt
/trunk/singlewebapp/src/app/org/openmeetings/app/data/flvrecord/FlvRecordingDaoImpl.java
/trunk/singlewebapp/src/app/org/openmeetings/app/data/flvrecord/converter/FlvInterviewConverter.java
/trunk/singlewebapp/src/app/org/openmeetings/app/hibernate/beans/flvrecord/FlvRecording.hbm.xml
/trunk/singlewebapp/src/app/org/openmeetings/app/hibernate/beans/flvrecord/FlvRecording.java
/trunk/singlewebapp/src/app/org/openmeetings/app/installation/ImportInitvalues.java
=======================================
--- /trunk/singlewebapp/WebContent/languages/arabic.xml Mon Mar 1 03:17:59
2010
+++ /trunk/singlewebapp/WebContent/languages/arabic.xml Sun Mar 7 15:21:49
2010
@@ -2758,4 +2758,10 @@
<string id="917" name="interview recording message">
<value>The recording for this interview is already started!</value>
</string>
+ <string id="918" name="interview error message">
+ <value>Cancel</value>
+ </string>
+ <string id="919" name="interview error message">
+ <value>The post-processing of an interview takes 5 minutes per 1
minute interview. The current progress of the interview post-processing
transcoding is:</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/chinese simplified.xml Mon
Mar 1 03:17:59 2010
+++ /trunk/singlewebapp/WebContent/languages/chinese simplified.xml Sun
Mar 7 15:21:49 2010
@@ -2757,4 +2757,10 @@
<string id="917" name="interview recording message">
<value>The recording for this interview is already started!</value>
</string>
+ <string id="918" name="interview error message">
+ <value>Cancel</value>
+ </string>
+ <string id="919" name="interview error message">
+ <value>The post-processing of an interview takes 5 minutes per 1
minute interview. The current progress of the interview post-processing
transcoding is:</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/chinese traditional.xml Mon
Mar 1 03:17:59 2010
+++ /trunk/singlewebapp/WebContent/languages/chinese traditional.xml Sun
Mar 7 15:21:49 2010
@@ -2763,4 +2763,10 @@
<string id="917" name="interview recording message">
<value>The recording for this interview is already started!</value>
</string>
+ <string id="918" name="interview error message">
+ <value>Cancel</value>
+ </string>
+ <string id="919" name="interview error message">
+ <value>The post-processing of an interview takes 5 minutes per 1
minute interview. The current progress of the interview post-processing
transcoding is:</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/czech.xml Mon Mar 1 03:17:59
2010
+++ /trunk/singlewebapp/WebContent/languages/czech.xml Sun Mar 7 15:21:49
2010
@@ -2757,4 +2757,10 @@
<string id="917" name="interview recording message">
<value>The recording for this interview is already started!</value>
</string>
+ <string id="918" name="interview error message">
+ <value>Cancel</value>
+ </string>
+ <string id="919" name="interview error message">
+ <value>The post-processing of an interview takes 5 minutes per 1
minute interview. The current progress of the interview post-processing
transcoding is:</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/deutsch.xml Mon Mar 1
03:17:59 2010
+++ /trunk/singlewebapp/WebContent/languages/deutsch.xml Sun Mar 7
15:21:49 2010
@@ -2757,4 +2757,10 @@
<string id="917" name="interview recording message">
<value>The recording for this interview is already started!</value>
</string>
+ <string id="918" name="interview error message">
+ <value>Cancel</value>
+ </string>
+ <string id="919" name="interview error message">
+ <value>The post-processing of an interview takes 5 minutes per 1
minute interview. The current progress of the interview post-processing
transcoding is:</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/dutch.xml Mon Mar 1 03:17:59
2010
+++ /trunk/singlewebapp/WebContent/languages/dutch.xml Sun Mar 7 15:21:49
2010
@@ -2756,4 +2756,10 @@
<string id="917" name="interview recording message">
<value>The recording for this interview is already started!</value>
</string>
+ <string id="918" name="interview video choice">
+ <value>Cancel</value>
+ </string>
+ <string id="919" name="interview error message">
+ <value>The post-processing of an interview takes 5 minutes per 1
minute interview. The current progress of the interview post-processing
transcoding is:</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/english.xml Mon Mar 1
03:17:59 2010
+++ /trunk/singlewebapp/WebContent/languages/english.xml Sun Mar 7
15:21:49 2010
@@ -2757,4 +2757,10 @@
<string id="917" name="interview recording message">
<value>The recording for this interview is already started!</value>
</string>
+ <string id="918" name="interview error message">
+ <value>Cancel</value>
+ </string>
+ <string id="919" name="interview error message">
+ <value>The post-processing of an interview takes 5 minutes per 1
minute interview. The current progress of the interview post-processing
transcoding is:</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/finnish.xml Mon Mar 1
03:17:59 2010
+++ /trunk/singlewebapp/WebContent/languages/finnish.xml Sun Mar 7
15:21:49 2010
@@ -2756,4 +2756,10 @@
<string id="917" name="interview recording message">
<value>The recording for this interview is already started!</value>
</string>
+ <string id="918" name="interview error message">
+ <value>Cancel</value>
+ </string>
+ <string id="919" name="interview error message">
+ <value>The post-processing of an interview takes 5 minutes per 1
minute interview. The current progress of the interview post-processing
transcoding is:</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/french.xml Mon Mar 1 03:17:59
2010
+++ /trunk/singlewebapp/WebContent/languages/french.xml Sun Mar 7 15:21:49
2010
@@ -2757,4 +2757,10 @@
<string id="917" name="interview recording message">
<value>The recording for this interview is already started!</value>
</string>
+ <string id="918" name="interview error message">
+ <value>Cancel</value>
+ </string>
+ <string id="919" name="interview error message">
+ <value>The post-processing of an interview takes 5 minutes per 1
minute interview. The current progress of the interview post-processing
transcoding is:</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/galician.xml Mon Mar 1
03:17:59 2010
+++ /trunk/singlewebapp/WebContent/languages/galician.xml Sun Mar 7
15:21:49 2010
@@ -2757,4 +2757,10 @@
<string id="917" name="interview recording message">
<value>The recording for this interview is already started!</value>
</string>
+ <string id="918" name="interview error message">
+ <value>Cancel</value>
+ </string>
+ <string id="919" name="interview error message">
+ <value>The post-processing of an interview takes 5 minutes per 1
minute interview. The current progress of the interview post-processing
transcoding is:</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/greek.xml Mon Mar 1 03:17:59
2010
+++ /trunk/singlewebapp/WebContent/languages/greek.xml Sun Mar 7 15:21:49
2010
@@ -2757,4 +2757,10 @@
<string id="917" name="interview recording message">
<value>The recording for this interview is already started!</value>
</string>
+ <string id="918" name="interview error message">
+ <value>Cancel</value>
+ </string>
+ <string id="919" name="interview error message">
+ <value>The post-processing of an interview takes 5 minutes per 1
minute interview. The current progress of the interview post-processing
transcoding is:</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/hebrew.xml Mon Mar 1 03:17:59
2010
+++ /trunk/singlewebapp/WebContent/languages/hebrew.xml Sun Mar 7 15:21:49
2010
@@ -2757,4 +2757,10 @@
<string id="917" name="interview recording message">
<value>The recording for this interview is already started!</value>
</string>
+ <string id="918" name="interview error message">
+ <value>Cancel</value>
+ </string>
+ <string id="919" name="interview error message">
+ <value>The post-processing of an interview takes 5 minutes per 1
minute interview. The current progress of the interview post-processing
transcoding is:</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/hungarian.xml Mon Mar 1
03:17:59 2010
+++ /trunk/singlewebapp/WebContent/languages/hungarian.xml Sun Mar 7
15:21:49 2010
@@ -2757,4 +2757,10 @@
<string id="917" name="interview recording message">
<value>The recording for this interview is already started!</value>
</string>
+ <string id="918" name="interview error message">
+ <value>Cancel</value>
+ </string>
+ <string id="919" name="interview error message">
+ <value>The post-processing of an interview takes 5 minutes per 1
minute interview. The current progress of the interview post-processing
transcoding is:</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/indonesian.xml Mon Mar 1
03:17:59 2010
+++ /trunk/singlewebapp/WebContent/languages/indonesian.xml Sun Mar 7
15:21:49 2010
@@ -2757,4 +2757,10 @@
<string id="917" name="interview recording message">
<value>The recording for this interview is already started!</value>
</string>
+ <string id="918" name="interview error message">
+ <value>Cancel</value>
+ </string>
+ <string id="919" name="interview error message">
+ <value>The post-processing of an interview takes 5 minutes per 1
minute interview. The current progress of the interview post-processing
transcoding is:</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/italian.xml Mon Mar 1
03:17:59 2010
+++ /trunk/singlewebapp/WebContent/languages/italian.xml Sun Mar 7
15:21:49 2010
@@ -2757,4 +2757,10 @@
<string id="917" name="interview recording message">
<value>The recording for this interview is already started!</value>
</string>
+ <string id="918" name="interview error message">
+ <value>Cancel</value>
+ </string>
+ <string id="919" name="interview error message">
+ <value>The post-processing of an interview takes 5 minutes per 1
minute interview. The current progress of the interview post-processing
transcoding is:</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/japanese.xml Mon Mar 1
03:17:59 2010
+++ /trunk/singlewebapp/WebContent/languages/japanese.xml Sun Mar 7
15:21:49 2010
@@ -2757,4 +2757,10 @@
<string id="917" name="interview recording message">
<value>The recording for this interview is already started!</value>
</string>
+ <string id="918" name="interview error message">
+ <value>Cancel</value>
+ </string>
+ <string id="919" name="interview error message">
+ <value>The post-processing of an interview takes 5 minutes per 1
minute interview. The current progress of the interview post-processing
transcoding is:</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/korean.xml Mon Mar 1 03:17:59
2010
+++ /trunk/singlewebapp/WebContent/languages/korean.xml Sun Mar 7 15:21:49
2010
@@ -2757,4 +2757,10 @@
<string id="917" name="interview recording message">
<value>The recording for this interview is already started!</value>
</string>
+ <string id="918" name="interview error message">
+ <value>Cancel</value>
+ </string>
+ <string id="919" name="interview error message">
+ <value>The post-processing of an interview takes 5 minutes per 1
minute interview. The current progress of the interview post-processing
transcoding is:</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/persian.xml Mon Mar 1
03:17:59 2010
+++ /trunk/singlewebapp/WebContent/languages/persian.xml Sun Mar 7
15:21:49 2010
@@ -2757,4 +2757,10 @@
<string id="917" name="interview recording message">
<value>The recording for this interview is already started!</value>
</string>
+ <string id="918" name="interview error message">
+ <value>Cancel</value>
+ </string>
+ <string id="919" name="interview error message">
+ <value>The post-processing of an interview takes 5 minutes per 1
minute interview. The current progress of the interview post-processing
transcoding is:</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/polish.xml Mon Mar 1 03:17:59
2010
+++ /trunk/singlewebapp/WebContent/languages/polish.xml Sun Mar 7 15:21:49
2010
@@ -2831,4 +2831,10 @@
<string id="917" name="interview recording message">
<value>The recording for this interview is already started!</value>
</string>
+ <string id="918" name="interview error message">
+ <value>Cancel</value>
+ </string>
+ <string id="919" name="interview error message">
+ <value>The post-processing of an interview takes 5 minutes per 1
minute interview. The current progress of the interview post-processing
transcoding is:</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/portugues brazil.xml Mon Mar
1 03:17:59 2010
+++ /trunk/singlewebapp/WebContent/languages/portugues brazil.xml Sun Mar
7 15:21:49 2010
@@ -2763,5 +2763,11 @@
<string id="917" name="interview recording message">
<value>The recording for this interview is already started!</value>
</string>
+ <string id="918" name="interview error message">
+ <value>Cancel</value>
+ </string>
+ <string id="919" name="interview error message">
+ <value>The post-processing of an interview takes 5 minutes per 1
minute interview. The current progress of the interview post-processing
transcoding is:</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/portugues.xml Mon Mar 1
03:17:59 2010
+++ /trunk/singlewebapp/WebContent/languages/portugues.xml Sun Mar 7
15:21:49 2010
@@ -2757,4 +2757,10 @@
<string id="917" name="interview recording message">
<value>The recording for this interview is already started!</value>
</string>
+ <string id="918" name="interview error message">
+ <value>Cancel</value>
+ </string>
+ <string id="919" name="interview error message">
+ <value>The post-processing of an interview takes 5 minutes per 1
minute interview. The current progress of the interview post-processing
transcoding is:</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/russian.xml Mon Mar 1
03:17:59 2010
+++ /trunk/singlewebapp/WebContent/languages/russian.xml Sun Mar 7
15:21:49 2010
@@ -2763,4 +2763,10 @@
<string id="917" name="interview recording message">
<value>The recording for this interview is already started!</value>
</string>
+ <string id="918" name="interview error message">
+ <value>Cancel</value>
+ </string>
+ <string id="919" name="interview error message">
+ <value>The post-processing of an interview takes 5 minutes per 1
minute interview. The current progress of the interview post-processing
transcoding is:</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/spanish.xml Mon Mar 1
03:17:59 2010
+++ /trunk/singlewebapp/WebContent/languages/spanish.xml Sun Mar 7
15:21:49 2010
@@ -2766,4 +2766,10 @@
<string id="917" name="interview recording message">
<value>The recording for this interview is already started!</value>
</string>
+ <string id="918" name="interview error message">
+ <value>Cancel</value>
+ </string>
+ <string id="919" name="interview error message">
+ <value>The post-processing of an interview takes 5 minutes per 1
minute interview. The current progress of the interview post-processing
transcoding is:</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/swedish.xml Mon Mar 1
03:17:59 2010
+++ /trunk/singlewebapp/WebContent/languages/swedish.xml Sun Mar 7
15:21:49 2010
@@ -2757,4 +2757,10 @@
<string id="917" name="interview recording message">
<value>The recording for this interview is already started!</value>
</string>
+ <string id="918" name="interview error message">
+ <value>Cancel</value>
+ </string>
+ <string id="919" name="interview error message">
+ <value>The post-processing of an interview takes 5 minutes per 1
minute interview. The current progress of the interview post-processing
transcoding is:</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/thai.xml Mon Mar 1 03:17:59
2010
+++ /trunk/singlewebapp/WebContent/languages/thai.xml Sun Mar 7 15:21:49
2010
@@ -2757,4 +2757,10 @@
<string id="917" name="interview recording message">
<value>The recording for this interview is already started!</value>
</string>
+ <string id="918" name="interview error message">
+ <value>Cancel</value>
+ </string>
+ <string id="919" name="interview error message">
+ <value>The post-processing of an interview takes 5 minutes per 1
minute interview. The current progress of the interview post-processing
transcoding is:</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/turkish.xml Mon Mar 1
03:17:59 2010
+++ /trunk/singlewebapp/WebContent/languages/turkish.xml Sun Mar 7
15:21:49 2010
@@ -2756,4 +2756,10 @@
<string id="917" name="interview recording message">
<value>The recording for this interview is already started!</value>
</string>
+ <string id="918" name="interview error message">
+ <value>Cancel</value>
+ </string>
+ <string id="919" name="interview error message">
+ <value>The post-processing of an interview takes 5 minutes per 1
minute interview. The current progress of the interview post-processing
transcoding is:</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/ukrainian.xml Mon Mar 1
03:17:59 2010
+++ /trunk/singlewebapp/WebContent/languages/ukrainian.xml Sun Mar 7
15:21:49 2010
@@ -2757,4 +2757,10 @@
<string id="917" name="interview recording message">
<value>The recording for this interview is already started!</value>
</string>
+ <string id="918" name="interview error message">
+ <value>Cancel</value>
+ </string>
+ <string id="919" name="interview error message">
+ <value>The post-processing of an interview takes 5 minutes per 1
minute interview. The current progress of the interview post-processing
transcoding is:</value>
+ </string>
</language>
=======================================
---
/trunk/singlewebapp/WebContent/lps/components/incubator/test/tooltipmanager-test.lzx
Sun Feb 14 02:27:53 2010
+++
/trunk/singlewebapp/WebContent/lps/components/incubator/test/tooltipmanager-test.lzx
Sun Mar 7 15:21:49 2010
@@ -13,7 +13,7 @@
<row key="button1" value="Hi! I'm the message for button one.
Ciao. Sono il messaggio per il tasto uno." />
<row key="button2" value="Hi! I'm the message for button two.
Bonjour. Je suis le message pour le bouton deux."/>
<row key="button3" value="Hi! I'm the message for button
three. ????. ?? ?? 3? ?? ??? ??."/>
- <row key="button4" value="Hi! I'm the message for button four.
Hallo. Ich bin die Anzeige für Taste vier."/>
+ <row key="button4" value="Hi! I'm the message for button four.
Hallo. Ich bin die Anzeige fuer Taste vier."/>
<row key="button5" value="Hi! I'm the message for button five.
Hello. Eu sou a mensagem para a tecla cinco."/>
<row key="button6" value="You should not see this"/>
</tooltips>
=======================================
---
/trunk/singlewebapp/WebContent/openmeetings/modules/conference/video/editRecordStream.lzx
Sat Mar 6 05:34:37 2010
+++
/trunk/singlewebapp/WebContent/openmeetings/modules/conference/video/editRecordStream.lzx
Sun Mar 7 15:21:49 2010
@@ -349,9 +349,9 @@
</simpleLabelButton>
<simpleLabelButton fontsize="11" visibility="${
(parent.isInterview) ? 'visible' : 'hidden' }"
- labelid="915" x="190" y="180" width="100">
+ labelid="918" x="190" y="180" width="100">
<handler name="onclick">
- this.close();
+ parent.close();
</handler>
</simpleLabelButton>
=======================================
---
/trunk/singlewebapp/WebContent/openmeetings/modules/lzrecordcontent/contentviews/lzRecordingsViewMain.lzx
Sun Feb 28 13:59:11 2010
+++
/trunk/singlewebapp/WebContent/openmeetings/modules/lzrecordcontent/contentviews/lzRecordingsViewMain.lzx
Sun Mar 7 15:21:49 2010
@@ -79,7 +79,9 @@
new
lz.messageRecordingWin(canvas,{error:tLogString,labelTitleId:887});
- } else if (recording.previewImage != null &&
recording.previewImage != "") {
+ }
+
+ if (recording.previewImage != null &&
recording.previewImage != "") {
this.recordingName = recording.fileHash;
this.getStreamLength.doCall();
@@ -114,7 +116,13 @@
} else {
- new
lz.labelerrorPopup(canvas,{errorlabelid:888});
+ var error = canvas.getLabelName(888);
+
+ if (recording.isInterview) {
+ error += "<br/>" + canvas.getLabelName(919) + " " +
recording.progressPostProcessing + "%";
+ }
+
+ new lz.labelerrorPopup(canvas,{error:error});
}
=======================================
--- /trunk/singlewebapp/conf/debug.txt Sun Mar 7 09:54:09 2010
+++ /trunk/singlewebapp/conf/debug.txt Sun Mar 7 15:21:49 2010
@@ -1,1 +1,1 @@
-C:\ffmpeg-static\bin\ffmpeg -r 25 -ar 22050 -ab 32k -s 640x240 -qmax 1
-qmin 1 -i
C:\workspaces\workspace_openmeetings\ROOT\dist\red5\webapps\openmeetings\streams\8\COMPLETE_INTERVIEW_62.flv
-i
C:\workspaces\workspace_openmeetings\ROOT\dist\red5\webapps\openmeetings\streams\8\rec_62_stream_0_07_03_2010_16_42_03_FULL_WAVE.wav
C:\workspaces\workspace_openmeetings\ROOT\dist\red5\webapps\openmeetings\streams\hibernate\flvRecording_62.flv
+ffmpeg -r 25 -vcodec flv -ar 22050 -ab 32k -s 640x240 -qmax 1 -qmin 1 -i
/Users/swagner/Documents/workspaces/workspace_openmeetings/ROOT/dist/red5/webapps/openmeetings/streams/8/COMPLETE_INTERVIEW_1.flv
-i
/Users/swagner/Documents/workspaces/workspace_openmeetings/ROOT/dist/red5/webapps/openmeetings/streams/8/rec_1_stream_0_07_03_2010_21_07_14_FULL_WAVE.wav
/Users/swagner/Documents/workspaces/workspace_openmeetings/ROOT/dist/red5/webapps/openmeetings/streams/hibernate/flvRecording_1.flv
=======================================
---
/trunk/singlewebapp/src/app/org/openmeetings/app/data/flvrecord/FlvRecordingDaoImpl.java
Tue Mar 2 05:26:27 2010
+++
/trunk/singlewebapp/src/app/org/openmeetings/app/data/flvrecord/FlvRecordingDaoImpl.java
Sun Mar 7 15:21:49 2010
@@ -358,6 +358,7 @@
FlvRecording fId =
this.getFlvRecordingById(flvRecordingId);
+ fId.setProgressPostProcessing(0);
fId.setRecordEnd(recordEnd);
fId.setOrganization_id(organization_id);
@@ -369,6 +370,28 @@
tx.commit();
HibernateUtil.closeSession(idf);
+ } catch (HibernateException ex) {
+ log.error("[deleteFileExplorerItem]: ",ex);
+ } catch (Exception ex2) {
+ log.error("[deleteFileExplorerItem]: ",ex2);
+ }
+ }
+
+ public void updateFlvRecordingProgress(Long flvRecordingId, Integer
progress) {
+ try {
+
+ FlvRecording fId =
this.getFlvRecordingById(flvRecordingId);
+
+ fId.setProgressPostProcessing(progress);
+
+ Object idf = HibernateUtil.createSession();
+ Session session = HibernateUtil.getSession();
+ Transaction tx = session.beginTransaction();
+ session.update(fId);
+ session.flush();
+ tx.commit();
+ HibernateUtil.closeSession(idf);
+
} catch (HibernateException ex) {
log.error("[deleteFileExplorerItem]: ",ex);
} catch (Exception ex2) {
=======================================
---
/trunk/singlewebapp/src/app/org/openmeetings/app/data/flvrecord/converter/FlvInterviewConverter.java
Sun Mar 7 09:54:09 2010
+++
/trunk/singlewebapp/src/app/org/openmeetings/app/data/flvrecord/converter/FlvInterviewConverter.java
Sun Mar 7 15:21:49 2010
@@ -727,8 +727,14 @@
currentTimeInMilliSeconds+=1000;
+ double cLength = 100 * ((double)currentTimeInMilliSeconds) /
((double)completeLengthInSeconds);
+
+ int progress =
Double.valueOf(cLength).intValue();
+
log.debug("completeLengthInSeconds|currentTimeInMilliSeconds " +
-
completeLengthInSeconds + "|" + currentTimeInMilliSeconds);
+ completeLengthInSeconds + "|" + currentTimeInMilliSeconds + "|" +
progress + "|" + cLength);
+
+
FlvRecordingDaoImpl.getInstance().updateFlvRecordingProgress(flvRecording.getFlvRecordingId(),
progress);
if (currentTimeInMilliSeconds >=
completeLengthInSeconds) {
@@ -883,7 +889,7 @@
for (String fileName : listOfFullWaveFiles) {
File audio = new File(fileName);
if (audio.exists()) {
- //audio.delete();
+ audio.delete();
}
}
@@ -893,10 +899,10 @@
+
flvRecordingMetaData.getFlvRecordingMetaDataId()
+
File.separatorChar ;
- //this.deleteDirectory(new
File(outputMetaImageFullData));
+ this.deleteDirectory(new
File(outputMetaImageFullData));
}
- //this.deleteDirectory(new File(outputImageMergedData));
+ this.deleteDirectory(new File(outputImageMergedData));
} catch (Exception err) {
log.error("[stripAudioFromFLVs]", err);
=======================================
---
/trunk/singlewebapp/src/app/org/openmeetings/app/hibernate/beans/flvrecord/FlvRecording.hbm.xml
Mon Feb 22 00:50:57 2010
+++
/trunk/singlewebapp/src/app/org/openmeetings/app/hibernate/beans/flvrecord/FlvRecording.hbm.xml
Sun Mar 7 15:21:49 2010
@@ -32,5 +32,6 @@
<property name="previewImage" type="string" column="preview_image"/>
<property name="alternateDownload" type="string"
column="alternate_download"/>
<property name="isInterview" type="boolean" column="is_interview"/>
+ <property name="progressPostProcessing" type="int"
column="progress_post_processing"/>
</class>
</hibernate-mapping>
=======================================
---
/trunk/singlewebapp/src/app/org/openmeetings/app/hibernate/beans/flvrecord/FlvRecording.java
Mon Feb 22 00:50:57 2010
+++
/trunk/singlewebapp/src/app/org/openmeetings/app/hibernate/beans/flvrecord/FlvRecording.java
Sun Mar 7 15:21:49 2010
@@ -52,6 +52,7 @@
private Long organization_id;
private Boolean isInterview;
+ private Integer progressPostProcessing;
//Not Mapped
private List<FlvRecordingMetaData> flvRecordingMetaData;
@@ -412,5 +413,18 @@
public void setIsInterview(Boolean isInterview) {
this.isInterview = isInterview;
}
+
+ /**
+ * @hibernate.property
+ * column="progress_post_processing"
+ * type="int"
+ */
+ public Integer getProgressPostProcessing() {
+ return progressPostProcessing;
+ }
+ public void setProgressPostProcessing(Integer progressPostProcessing) {
+ this.progressPostProcessing = progressPostProcessing;
+ }
+
}
=======================================
---
/trunk/singlewebapp/src/app/org/openmeetings/app/installation/ImportInitvalues.java
Tue Feb 23 07:52:21 2010
+++
/trunk/singlewebapp/src/app/org/openmeetings/app/installation/ImportInitvalues.java
Sun Mar 7 15:21:49 2010
@@ -388,31 +388,34 @@
long interview_Id =
Roommanagement.getInstance().addRoomType("interview");
log.debug("interview_Id: " + interview_Id);
- Roommanagement.getInstance().addRoom(3, "public Conference
Room", 1,
+ Roommanagement.getInstance().addRoom(3, "public Interview Room",
interview_Id,
+ "", new Long(16), true, null, false, false,
null, false, null, true);
+
+ Roommanagement.getInstance().addRoom(3, "public Conference Room",
conference_Id,
"", new Long(8), true, null, false, false,
null, false, null, true);
- Roommanagement.getInstance().addRoom(3, "public Video Only
Room", 1,
+ Roommanagement.getInstance().addRoom(3, "public Video Only Room",
conference_Id,
"", new Long(16), true, null, false, false,
null, false, null, true);
Roommanagement.getInstance().addRoom(3,
- "public Video And Whiteboard Room", 1, "", new
Long(16), true,
+ "public Video And Whiteboard Room", conference_Id, "", new Long(16),
true,
null, false, false, null, false, null, true);
Roommanagement.getInstance().addRoom(3, "public Restricted Room",
restricted_Id,
"", new Long(10), true, null, false, false,
null, false, null, true);
long room2 = Roommanagement.getInstance().addRoom(3,
- "private Conference Room", 1, "", new Long(16),
false, null,
+ "private Conference Room", conference_Id, "", new Long(16), false,
null,
false, false, null, false, null, true);
Roommanagement.getInstance().addRoomToOrganisation(3, room2, 1);
Roommanagement.getInstance().addRoom(3,
- "public Audience Room", 2, "", new Long(32),
true, null,
+ "public Audience Room", audience_Id, "", new
Long(32), true, null,
false, false, null, false, null, true);
long room4 = Roommanagement.getInstance().addRoom(3,
- "private Audience Room", 2, "", new Long(32),
false, null,
+ "private Audience Room", audience_Id, "", new
Long(32), false, null,
false, false, null, false, null, true);
Roommanagement.getInstance().addRoomToOrganisation(3, room4, 1);
--
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.
