Revision: 3745
Author: seba.wagner
Date: Tue Apr 26 02:03:59 2011
Log: [No log message]
http://code.google.com/p/openmeetings/source/detail?r=3745
Modified:
/trunk/singlewebapp/src/app/org/openmeetings/app/remote/MainService.java
/trunk/singlewebapp/src/app/org/openmeetings/servlet/outputhandler/ScreenRequestHandler.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/app/org/openmeetings/app/remote/MainService.java
Mon Apr 18 11:24:35 2011
+++
/trunk/singlewebapp/src/app/org/openmeetings/app/remote/MainService.java
Tue Apr 26 02:03:59 2011
@@ -467,6 +467,9 @@
if (currentClient.getUser_id() != null) {
Sessionmanagement.getInstance().updateUser(SID,
currentClient.getUser_id());
}
+
+
currentClient.setAllowRecording(soapLogin.getAllowRecording());
+ this.clientListManager.updateClientByStreamId(streamId,
currentClient);
if (loginReturn == null) {
=======================================
---
/trunk/singlewebapp/src/app/org/openmeetings/servlet/outputhandler/ScreenRequestHandler.java
Sun Feb 27 07:02:40 2011
+++
/trunk/singlewebapp/src/app/org/openmeetings/servlet/outputhandler/ScreenRequestHandler.java
Tue Apr 26 02:03:59 2011
@@ -304,6 +304,13 @@
return null;
}
ctx.put("port", port);
+
+ String allowRecording =
httpServletRequest.getParameter("allowRecording");
+ if (allowRecording ==
null) {
+ new
Exception("allowRecording is empty: ");
+ return null;
+ }
+
ctx.put("allowRecording", allowRecording);
}
else
=======================================
---
/trunk/singlewebapp/src/red5-screenshare/org/red5/screen/webstart/ScreenShare.java
Sun Feb 27 07:02:40 2011
+++
/trunk/singlewebapp/src/red5-screenshare/org/red5/screen/webstart/ScreenShare.java
Tue Apr 26 02:03:59 2011
@@ -147,6 +147,7 @@
public Long organization_id = 0L;
public Long user_id = null;
+ public Boolean allowRecording = true;
public boolean startRecording = false;
public boolean stopRecording = false;
@@ -205,7 +206,7 @@
instance = new ScreenShare();
- if (args.length == 8) {
+ if (args.length == 9) {
instance.host = args[0];
@@ -220,6 +221,7 @@
instance.defaultQualityScreensharing =
Integer.parseInt(args[6]);
instance.user_id =
Long.parseLong(args[7]);
+ instance.allowRecording =
Boolean.parseBoolean(args[8]);
if (labelTexts.length() > 0) {
String[] textArray =
labelTexts.split(";");
@@ -378,34 +380,38 @@
contentPane.add(textAreaHeaderRecordingDescr);
textAreaHeaderRecordingDescr.setBounds(10, 360,
480, 54);
- //*****
- //Start Button Recording
- startButtonRecording = new JButton( this.label871,
start_btn );
- startButtonRecording.addActionListener( new
ActionListener(){
- public void actionPerformed(ActionEvent
arg0) {
- // TODO Auto-generated method stub
- startRecording = true;
- startStreaming = false;
- captureScreenStart();
- }
- });
- startButtonRecording.setBounds(30, 420, 200, 32);
- t.add(startButtonRecording);
-
- //*****
- //Stop Button Recording
- stopButtonRecording = new JButton( this.label872,
stop_btn );
- stopButtonRecording.addActionListener( new
ActionListener(){
- public void actionPerformed(ActionEvent
arg0) {
- // TODO Auto-generated method stub
- stopRecording = true;
- stopStreaming = false;
- captureScreenStop();
- }
- });
- stopButtonRecording.setBounds(290, 420, 200, 32);
- stopButtonRecording.setEnabled(false);
- t.add(stopButtonRecording);
+ if (instance.allowRecording) {
+
+ //*****
+ //Start Button Recording
+ startButtonRecording = new JButton(
this.label871, start_btn );
+ startButtonRecording.addActionListener( new
ActionListener(){
+ public void actionPerformed(ActionEvent
arg0) {
+ // TODO Auto-generated method
stub
+ startRecording = true;
+ startStreaming = false;
+ captureScreenStart();
+ }
+ });
+ startButtonRecording.setBounds(30, 420, 200,
32);
+ t.add(startButtonRecording);
+
+ //*****
+ //Stop Button Recording
+ stopButtonRecording = new JButton( this.label872,
stop_btn );
+ stopButtonRecording.addActionListener( new
ActionListener(){
+ public void actionPerformed(ActionEvent
arg0) {
+ // TODO Auto-generated method
stub
+ stopRecording = true;
+ stopStreaming = false;
+ captureScreenStop();
+ }
+ });
+ stopButtonRecording.setBounds(290, 420, 200,
32);
+ stopButtonRecording.setEnabled(false);
+ t.add(stopButtonRecording);
+
+ }
//*****
//Text Warning
=======================================
---
/trunk/singlewebapp/src/red5-screenshare/org/red5/screen/webstart/ScreenShareRTMPT.java
Sun Feb 27 07:02:40 2011
+++
/trunk/singlewebapp/src/red5-screenshare/org/red5/screen/webstart/ScreenShareRTMPT.java
Tue Apr 26 02:03:59 2011
@@ -148,6 +148,7 @@
public Long organization_id = 0L;
public Long user_id = null;
+ public Boolean allowRecording = true;
public boolean startRecording = false;
public boolean stopRecording = false;
@@ -205,7 +206,7 @@
try {
instance = new ScreenShareRTMPT();
- if (args.length == 8) {
+ if (args.length == 9) {
instance.host = args[0];
@@ -220,6 +221,7 @@
instance.defaultQualityScreensharing =
Integer.parseInt(args[6]);
instance.user_id = Long.parseLong(args[7]);
+ instance.allowRecording = Boolean.parseBoolean(args[8]);
if (labelTexts.length() > 0) {
String[] textArray =
labelTexts.split(";");
@@ -375,35 +377,39 @@
contentPane.add(textAreaHeaderRecordingDescr);
textAreaHeaderRecordingDescr.setBounds(10, 360, 480,
54);
- //*****
- //Start Button Recording
- startButtonRecording = new JButton( this.label871,
start_btn );
- startButtonRecording.addActionListener( new
ActionListener(){
- public void actionPerformed(ActionEvent arg0) {
- // TODO Auto-generated method stub
- startRecording = true;
- startStreaming = false;
- captureScreenStart();
- }
- });
- startButtonRecording.setBounds(30, 420, 200, 32);
- t.add(startButtonRecording);
-
- //*****
- //Stop Button Recording
- stopButtonRecording = new JButton( this.label872,
stop_btn );
- stopButtonRecording.addActionListener( new
ActionListener(){
- public void actionPerformed(ActionEvent arg0) {
- // TODO Auto-generated method stub
- stopRecording = true;
- stopStreaming = false;
- captureScreenStop();
- }
- });
- stopButtonRecording.setBounds(290, 420, 200, 32);
- stopButtonRecording.setEnabled(false);
- t.add(stopButtonRecording);
-
+ if (instance.allowRecording) {
+
+ //*****
+ //Start Button Recording
+ startButtonRecording = new JButton(
this.label871, start_btn );
+ startButtonRecording.addActionListener( new
ActionListener(){
+ public void actionPerformed(ActionEvent
arg0) {
+ // TODO Auto-generated method
stub
+ startRecording = true;
+ startStreaming = false;
+ captureScreenStart();
+ }
+ });
+ startButtonRecording.setBounds(30, 420, 200,
32);
+ t.add(startButtonRecording);
+
+ //*****
+ //Stop Button Recording
+ stopButtonRecording = new JButton(
this.label872, stop_btn );
+ stopButtonRecording.addActionListener( new
ActionListener(){
+ public void actionPerformed(ActionEvent
arg0) {
+ // TODO Auto-generated method
stub
+ stopRecording = true;
+ stopStreaming = false;
+ captureScreenStop();
+ }
+ });
+ stopButtonRecording.setBounds(290, 420, 200,
32);
+ stopButtonRecording.setEnabled(false);
+ t.add(stopButtonRecording);
+
+ }
+
//*****
//Text Warning
textWarningArea = new JLabel();
--
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.
