Revision: 2852
Author: seba.wagner
Date: Mon Feb 1 07:33:54 2010
Log: Improving the Audio Skit problem
http://code.google.com/p/openmeetings/source/detail?r=2852
Modified:
/trunk/singlewebapp/WebContent/conf/hibernate.cfg.xml
/trunk/singlewebapp/src/app/org/openmeetings/app/data/flvrecord/converter/FlvRecorderConverter.java
/trunk/singlewebapp/src/app/org/openmeetings/app/documents/GenerateSWF.java
=======================================
--- /trunk/singlewebapp/WebContent/conf/hibernate.cfg.xml Sat Jan 30
05:01:36 2010
+++ /trunk/singlewebapp/WebContent/conf/hibernate.cfg.xml Mon Feb 1
07:33:54 2010
@@ -10,13 +10,13 @@
<!-- User / Password -->
<property name="connection.username">root</property>
- <property name="connection.password"></property>
+ <property name="connection.password">admin</property>
<!-- Database Settings -->
<property
name="connection.driver_class">com.mysql.jdbc.Driver</property>
<!-- for performance reasons changed to MyISAM from
org.hibernate.dialect.MySQLInnoDBDialect -->
<property
name="dialect">org.hibernate.dialect.MySQLMyISAMDialect</property>
- <property
name="connection.url">jdbc:mysql://localhost/openmeetings?autoReconnect=true&useUnicode=true&createDatabaseIfNotExist=true&characterEncoding=utf-8</property>
+ <property
name="connection.url">jdbc:mysql://localhost/openmeetings_max_test8?autoReconnect=true&useUnicode=true&createDatabaseIfNotExist=true&characterEncoding=utf-8</property>
<property name="hibernate.connection.CharSet">utf8</property>
<property
name="hibernate.connection.characterEncoding">utf8</property>
=======================================
---
/trunk/singlewebapp/src/app/org/openmeetings/app/data/flvrecord/converter/FlvRecorderConverter.java
Sat Jan 30 05:00:36 2010
+++
/trunk/singlewebapp/src/app/org/openmeetings/app/data/flvrecord/converter/FlvRecorderConverter.java
Mon Feb 1 07:33:54 2010
@@ -187,7 +187,7 @@
int counter = 0;
- long startGap = 0;
+ double startGap = 0;
for (FlvRecordingMetaDelta flvRecordingMetaDelta :
flvRecordingMetaDeltas) {
@@ -204,9 +204,9 @@
if (flvRecordingMetaDelta.getIsStartPadding() != null &&
flvRecordingMetaDelta.getIsStartPadding()) {
- float gapSeconds =
flvRecordingMetaDelta.getDeltaTime()/1000;
-
- startGap =
flvRecordingMetaDelta.getDeltaTime();
+ double gapSeconds =
Double.valueOf(flvRecordingMetaDelta.getDeltaTime().toString()).doubleValue()/1000;
+
+ startGap =
Double.valueOf(flvRecordingMetaDelta.getDeltaTime().toString()).doubleValue();
if (gapSeconds > 0) {
//Add the item
at the beginning
@@ -217,7 +217,7 @@
} else if (flvRecordingMetaDelta.getIsEndPadding() != null &&
flvRecordingMetaDelta.getIsEndPadding()) {
- float gapSeconds =
flvRecordingMetaDelta.getDeltaTime()/1000;
+ double gapSeconds =
Double.valueOf(flvRecordingMetaDelta.getDeltaTime().toString()).doubleValue()/1000;
if (gapSeconds > 0) {
//Add the item
at the end
@@ -228,7 +228,7 @@
} else if
(flvRecordingMetaDelta.getDeltaTime().equals(flvRecordingMetaDelta.getTimeStamp()))
{
- float gapSeconds =
flvRecordingMetaDelta.getDeltaTime()/1000;
+ double gapSeconds =
Double.valueOf(flvRecordingMetaDelta.getDeltaTime().toString()).doubleValue()/1000;
//Add the item at the
beginning
argv_sox = new String[]
{ this.getPathToSoX(),
@@ -237,8 +237,8 @@
} else {
- float gapSeconds =
flvRecordingMetaDelta.getDeltaTime()/1000;
- float posSeconds = ( ( flvRecordingMetaDelta.getTimeStamp() +
startGap ) - flvRecordingMetaDelta.getDeltaTime() - 50 ) /1000;
+ double gapSeconds =
Double.valueOf(flvRecordingMetaDelta.getDeltaTime().toString()).doubleValue()/1000;
+ double posSeconds = ( (
Double.valueOf(flvRecordingMetaDelta.getTimeStamp().toString()).doubleValue()
+ startGap ) -
Double.valueOf(flvRecordingMetaDelta.getDeltaTime().toString()).doubleValue()
- 50 ) /1000;
if (posSeconds < 0) {
throw new Exception("posSeconds is Negative, this should never
happen!
flvRecordingMetaDeltaId ::"+flvRecordingMetaDelta.getFlvRecordingMetaDeltaId()+"
posSeconds :: "+posSeconds);
=======================================
---
/trunk/singlewebapp/src/app/org/openmeetings/app/documents/GenerateSWF.java
Thu Jan 14 09:15:56 2010
+++
/trunk/singlewebapp/src/app/org/openmeetings/app/documents/GenerateSWF.java
Mon Feb 1 07:33:54 2010
@@ -96,6 +96,10 @@
errorWatcher.interrupt();
inputWatcher.interrupt();
Thread.currentThread().interrupt();
+
+ returnMap.put("error", ex.getMessage());
+ returnMap.put("exitValue", -1);
+
throw ex;
}
finally
--
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.
