Revision: 2773
Author: seba.wagner
Date: Tue Jan 5 07:43:24 2010
Log: Fixes Issue 1065, Fixes Issue 1064
http://code.google.com/p/openmeetings/source/detail?r=2773
Modified:
/trunk/singlewebapp/WebContent/openmeetings/base/components/explorer/explorerBox.lzx
/trunk/singlewebapp/WebContent/openmeetings/base/hibernate/hibRtmpConnection.lzx
/trunk/singlewebapp/WebContent/openmeetings/config.xml
/trunk/singlewebapp/WebContent/openmeetings/modules/conference/conference/conferenceMenubar.lzx
/trunk/singlewebapp/WebContent/openmeetings/modules/lzrecordcontent/lzRecordNavigation.lzx
/trunk/singlewebapp/src/app/org/openmeetings/app/data/flvrecord/FlvRecordingDaoImpl.java
/trunk/singlewebapp/src/app/org/openmeetings/app/data/flvrecord/converter/FlvRecorderConverter.java
/trunk/singlewebapp/src/app/org/openmeetings/app/remote/FLVRecorderService.java
/trunk/singlewebapp/src/red5-screenshare/org/red5/screen/webstart/ScreenShare.java
/trunk/singlewebapp/src/red5-screenshare/org/red5/screen/webstart/ScreenShareRTMPT.java
/trunk/singlewebapp/src/red5-screenshare/org/red5/screen/webstart/gui/VirtualScreen.java
=======================================
---
/trunk/singlewebapp/WebContent/openmeetings/base/components/explorer/explorerBox.lzx
Thu Nov 5 05:40:08 2009
+++
/trunk/singlewebapp/WebContent/openmeetings/base/components/explorer/explorerBox.lzx
Tue Jan 5 07:43:24 2010
@@ -320,8 +320,8 @@
this.setColorTransform( { ra : red, ga : green,
ba : blue,
rb : 0, gb : 0,
bb : 0 } );
- if($debug)
Debug.write("explorerBox/setTintRGB",this);
- if($debug)
Debug.write("explorerBox/setTintRGB", { ra : red,
ga : green, ba : blue, rb : 0, gb : 0, bb : 0 } );
+ //if($debug)
Debug.write("explorerBox/setTintRGB",this);
+ //if($debug)
Debug.write("explorerBox/setTintRGB", { ra : red,
ga : green, ba : blue, rb : 0, gb : 0, bb : 0 } );
}
]]>
</method>
=======================================
---
/trunk/singlewebapp/WebContent/openmeetings/base/hibernate/hibRtmpConnection.lzx
Fri Dec 25 07:15:16 2009
+++
/trunk/singlewebapp/WebContent/openmeetings/base/hibernate/hibRtmpConnection.lzx
Tue Jan 5 07:43:24 2010
@@ -143,7 +143,7 @@
<netRemoteCallHib name="refreshSession"
funcname="userservice.refreshSession" showLoading="false" >
<netparam><method name="getValue">return
canvas.sessionId;</method></netparam>
<handler name="ondata" args="value">
- if ($debug) Debug.write("hibRtmpConnection/refreshSession
[",value,"]");
+ //if ($debug) Debug.write("hibRtmpConnection/refreshSession
[",value,"]");
lz.Timer.addTimer( parent.refreshDelegate,
canvas.refreshSession );
</handler>
</netRemoteCallHib>
=======================================
--- /trunk/singlewebapp/WebContent/openmeetings/config.xml Thu Dec 17
08:46:13 2009
+++ /trunk/singlewebapp/WebContent/openmeetings/config.xml Tue Jan 5
07:43:24 2010
@@ -75,7 +75,7 @@
the result of this notification is that you see the green-light
highlighted if
a remote user is speaking
-->
-<loudnessAcitviation>7</loudnessAcitviation>
+<loudnessAcitviation>0</loudnessAcitviation>
<!--
OpenMeetings-Webapp Name
=======================================
---
/trunk/singlewebapp/WebContent/openmeetings/modules/conference/conference/conferenceMenubar.lzx
Thu Dec 3 05:17:44 2009
+++
/trunk/singlewebapp/WebContent/openmeetings/modules/conference/conference/conferenceMenubar.lzx
Tue Jan 5 07:43:24 2010
@@ -69,7 +69,8 @@
<menuseparator/>
<_labelMenuItem labelid="239" enabled="${ canvas.ismoderator
}">
<handler name="onselect" args="sel">
-
canvas._conferencemenu._moderationPanel.checkSharerSession.doCall();
+ if ($debug) Debug.write("checkSharerSession.doCall");
+ canvas._mymod.checkSharerSession.doCall();
</handler>
</_labelMenuItem>
<menuseparator/>
=======================================
---
/trunk/singlewebapp/WebContent/openmeetings/modules/lzrecordcontent/lzRecordNavigation.lzx
Tue Dec 29 12:56:35 2009
+++
/trunk/singlewebapp/WebContent/openmeetings/modules/lzrecordcontent/lzRecordNavigation.lzx
Tue Jan 5 07:43:24 2010
@@ -40,6 +40,7 @@
<netRemoteCallHib name="getFLVExplorerByRoom"
funcname="flvrecorderservice.getFLVExplorerByRoom"
remotecontext="$once{ canvas.thishib }" >
<netparam><method name="getValue">return
canvas.sessionId;</method></netparam>
+ <netparam><method name="getValue">return
hib.currentdomainObj.organisation_id;</method></netparam>
<handler name="ondata" args="value">
if ($debug) Debug.write("getFileExplorerByRoom: ",value);
parent.parseRootItems(value);
=======================================
---
/trunk/singlewebapp/src/app/org/openmeetings/app/data/flvrecord/FlvRecordingDaoImpl.java
Tue Dec 29 06:13:44 2009
+++
/trunk/singlewebapp/src/app/org/openmeetings/app/data/flvrecord/FlvRecordingDaoImpl.java
Tue Jan 5 07:43:24 2010
@@ -84,12 +84,13 @@
return null;
}
- public List<FlvRecording> getFlvRecordingRootByPublic() {
+ public List<FlvRecording> getFlvRecordingRootByPublic(Long
organization_id) {
try {
String hql = "SELECT c FROM FlvRecording c " +
"WHERE c.deleted != :deleted " +
"AND c.ownerId IS NULL " +
+ "AND c.organization_id =
:organization_id " +
"AND (c.parentFileExplorerItemId IS
NULL OR
c.parentFileExplorerItemId = 0) " +
"ORDER BY c.isFolder DESC, c.fileName ";
@@ -97,6 +98,7 @@
Session session = HibernateUtil.getSession();
Transaction tx = session.beginTransaction();
Query query = session.createQuery(hql);
+ query.setLong("organization_id", organization_id);
query.setString("deleted", "true");
List<FlvRecording> flvRecordingList = query.list();
=======================================
---
/trunk/singlewebapp/src/app/org/openmeetings/app/data/flvrecord/converter/FlvRecorderConverter.java
Mon Jan 4 04:59:59 2010
+++
/trunk/singlewebapp/src/app/org/openmeetings/app/data/flvrecord/converter/FlvRecorderConverter.java
Tue Jan 5 07:43:24 2010
@@ -138,7 +138,7 @@
log.debug("START stripAudioFromFLVs
################# ");
for (int i = 0; i < argv.length; i++) {
- log.debug(" i " + i + " argv-i " +
argv[i]);
+ //log.debug(" i " + i + " argv-i " +
argv[i]);
}
log.debug("END stripAudioFromFLVs
################# ");
@@ -189,7 +189,7 @@
log.debug("START addAudioToWaves
################# ");
for (int i = 0; i < argv_sox.length;
i++) {
- log.debug(" i " + i + " argv-i
" + argv_sox[i]);
+ //log.debug(" i " + i + "
argv-i " + argv_sox[i]);
}
log.debug("END addAudioToWaves
################# ");
@@ -240,7 +240,7 @@
String iString = "";
for (int i = 0; i < argv_full_sox.length; i++) {
iString += argv_full_sox[i] + " ";
- log.debug(" i " + i + " argv-i " +
argv_full_sox[i]);
+ //log.debug(" i " + i + " argv-i " +
argv_full_sox[i]);
}
log.debug(iString);
log.debug("END mergeAudioToWaves
################# ");
@@ -274,7 +274,7 @@
String tString = "";
for (int i = 0; i < argv_full_sox.length; i++) {
tString += argv_full_sox[i] + " ";
- log.debug(" i " + i + " argv-i " +
argv_full_sox[i]);
+ //log.debug(" i " + i + " argv-i " +
argv_full_sox[i]);
}
log.debug(tString);
log.debug("END generateSampleAudio
################# ");
@@ -341,9 +341,15 @@
}
- flvWidth = Double.valueOf((1 * Math.floor((flvWidth +
0.5) /
1))).intValue();
- flvHeight = Double.valueOf((1 * Math.floor((flvHeight +
0.5) /
1))).intValue();
-
+ log.debug("flvWidth -1- "+flvWidth);
+ log.debug("flvHeight -1- "+flvHeight);
+
+ flvWidth = Double.valueOf((Math.floor(flvWidth / 16)) *
16).intValue();
+ flvHeight = Double.valueOf((Math.floor(flvHeight / 16))
*
16).intValue();
+
+ log.debug("flvWidth -2- "+flvWidth);
+ log.debug("flvHeight -2- "+flvHeight);
+
flvRecording.setFlvWidth(flvWidth);
flvRecording.setFlvHeight(flvHeight);
@@ -359,7 +365,7 @@
String tString = "";
for (int i = 0; i < argv_fullFLV.length; i++) {
tString += argv_fullFLV[i] + " ";
- log.debug(" i " + i + " argv-i " +
argv_fullFLV[i]);
+ //log.debug(" i " + i + " argv-i " +
argv_fullFLV[i]);
}
log.debug(tString);
log.debug("END generateFullFLV ################# ");
@@ -389,7 +395,7 @@
String kString = "";
for (int i = 0; i < argv_previewFLV.length; i++) {
kString += argv_previewFLV[i] + " ";
- log.debug(" i " + i + " argv-i " +
argv_previewFLV[i]);
+ //log.debug(" i " + i + " argv-i " +
argv_previewFLV[i]);
}
log.debug(kString);
log.debug("END previewFullFLV ################# ");
=======================================
---
/trunk/singlewebapp/src/app/org/openmeetings/app/remote/FLVRecorderService.java
Tue Dec 29 06:13:44 2009
+++
/trunk/singlewebapp/src/app/org/openmeetings/app/remote/FLVRecorderService.java
Tue Jan 5 07:43:24 2010
@@ -609,7 +609,7 @@
return null;
}
- public FLVRecorderObject getFLVExplorerByRoom(String SID) {
+ public FLVRecorderObject getFLVExplorerByRoom(String SID, Long
organization_id) {
try {
Long users_id =
Sessionmanagement.getInstance().checkSession(SID);
Long user_level =
Usermanagement.getInstance().getUserLevelByID(users_id);
@@ -619,7 +619,7 @@
fileExplorerObject.setUserHome(this.flvRecordingDaoImpl.getFlvRecordingRootByOwner(users_id));
-
fileExplorerObject.setRoomHome(this.flvRecordingDaoImpl.getFlvRecordingRootByPublic());
+
fileExplorerObject.setRoomHome(this.flvRecordingDaoImpl.getFlvRecordingRootByPublic(organization_id));
return fileExplorerObject;
=======================================
---
/trunk/singlewebapp/src/red5-screenshare/org/red5/screen/webstart/ScreenShare.java
Tue Dec 29 06:13:44 2009
+++
/trunk/singlewebapp/src/red5-screenshare/org/red5/screen/webstart/ScreenShare.java
Tue Jan 5 07:43:24 2010
@@ -323,12 +323,12 @@
textAreaHeaderRecording.setText(this.label869);
contentPane.add(textAreaHeaderRecording);
- textAreaHeaderRecording.setBounds(10, 300, 480, 24);
+ textAreaHeaderRecording.setBounds(10, 340, 480, 24);
textAreaHeaderRecordingDescr = new JLabel();
textAreaHeaderRecordingDescr.setText(this.label870);
contentPane.add(textAreaHeaderRecordingDescr);
- textAreaHeaderRecordingDescr.setBounds(10, 320, 480,
54);
+ textAreaHeaderRecordingDescr.setBounds(10, 360, 480,
54);
//*****
//Start Button Recording
@@ -341,7 +341,7 @@
captureScreenStart();
}
});
- startButtonRecording.setBounds(30, 380, 200, 32);
+ startButtonRecording.setBounds(30, 420, 200, 32);
t.add(startButtonRecording);
//*****
@@ -355,7 +355,7 @@
captureScreenStop();
}
});
- stopButtonRecording.setBounds(290, 380, 200, 32);
+ stopButtonRecording.setBounds(290, 420, 200, 32);
stopButtonRecording.setEnabled(false);
t.add(stopButtonRecording);
@@ -363,7 +363,7 @@
//Text Warning
textWarningArea = new JLabel();
contentPane.add(textWarningArea);
- textWarningArea.setBounds(10, 410, 420,54);
+ textWarningArea.setBounds(10, 450, 420,54);
//textWarningArea.setBackground(Color.WHITE);
@@ -377,7 +377,7 @@
System.exit(0);
}
});
- exitButton.setBounds(290, 420, 200, 24);
+ exitButton.setBounds(290, 460, 200, 32);
t.add(exitButton);
//*****
@@ -398,7 +398,7 @@
});
t.pack();
t.setLocation(30, 30);
- t.setSize(500, 480);
+ t.setSize(500, 530);
t.setVisible(true);
t.setResizable(false);
=======================================
---
/trunk/singlewebapp/src/red5-screenshare/org/red5/screen/webstart/ScreenShareRTMPT.java
Tue Dec 29 06:13:44 2009
+++
/trunk/singlewebapp/src/red5-screenshare/org/red5/screen/webstart/ScreenShareRTMPT.java
Tue Jan 5 07:43:24 2010
@@ -323,12 +323,12 @@
textAreaHeaderRecording.setText(this.label869);
contentPane.add(textAreaHeaderRecording);
- textAreaHeaderRecording.setBounds(10, 300, 480, 24);
+ textAreaHeaderRecording.setBounds(10, 340, 480, 24);
textAreaHeaderRecordingDescr = new JLabel();
textAreaHeaderRecordingDescr.setText(this.label870);
contentPane.add(textAreaHeaderRecordingDescr);
- textAreaHeaderRecordingDescr.setBounds(10, 320, 480,
54);
+ textAreaHeaderRecordingDescr.setBounds(10, 360, 480,
54);
//*****
//Start Button Recording
@@ -341,7 +341,7 @@
captureScreenStart();
}
});
- startButtonRecording.setBounds(30, 380, 200, 32);
+ startButtonRecording.setBounds(30, 420, 200, 32);
t.add(startButtonRecording);
//*****
@@ -355,7 +355,7 @@
captureScreenStop();
}
});
- stopButtonRecording.setBounds(290, 380, 200, 32);
+ stopButtonRecording.setBounds(290, 420, 200, 32);
stopButtonRecording.setEnabled(false);
t.add(stopButtonRecording);
@@ -363,7 +363,7 @@
//Text Warning
textWarningArea = new JLabel();
contentPane.add(textWarningArea);
- textWarningArea.setBounds(10, 410, 420,54);
+ textWarningArea.setBounds(10, 450, 420,54);
//textWarningArea.setBackground(Color.WHITE);
@@ -377,7 +377,7 @@
System.exit(0);
}
});
- exitButton.setBounds(290, 420, 200, 24);
+ exitButton.setBounds(290, 460, 200, 24);
t.add(exitButton);
//*****
@@ -398,7 +398,7 @@
});
t.pack();
t.setLocation(30, 30);
- t.setSize(500, 480);
+ t.setSize(500, 530);
t.setVisible(true);
t.setResizable(false);
=======================================
---
/trunk/singlewebapp/src/red5-screenshare/org/red5/screen/webstart/gui/VirtualScreen.java
Fri Dec 11 13:48:23 2009
+++
/trunk/singlewebapp/src/red5-screenshare/org/red5/screen/webstart/gui/VirtualScreen.java
Tue Jan 5 07:43:24 2010
@@ -307,6 +307,7 @@
ScreenShare.instance.vScreenIconLeft.setLocation(
Long.valueOf(Math.round(newvScreenX)).intValue()+30-16,
Long.valueOf(Math.round(newvScreenY)).intValue()+162+(Long.valueOf(Math.round(newvScreenHeight)).intValue()/2));
+
ScreenShare.instance.vScreenIconRight.setLocation(
Long.valueOf(Math.round(newvScreenX)).intValue()+30+Long.valueOf(Math.round(newvScreenWidth)).intValue()-16,
Long.valueOf(Math.round(newvScreenY)).intValue()+162+((Long.valueOf(Math.round(newvScreenHeight)).intValue())/2));
--
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.
