Commit Graph

6236 Commits

Author SHA1 Message Date
Fred Dixon
37107430b7 Update API example to use setConfigXML, not setConfigXML.xml 2013-06-15 01:47:41 -07:00
Fred Dixon
5b963b5c58 Added --setsecret 2013-06-14 23:38:19 -07:00
Fred Dixon
e7af666fe9 Fixed https://code.google.com/p/bigbluebutton/issues/detail?id=1557 2013-06-14 22:39:57 -07:00
Felipe Cecagno
fea7486ae3 implemented the possibility to include the desktop sharing streams to the presentation playback; it composes the presentation video file just like the other video streams, with the difference that while the screen is being sharing, it appears as the unique video stream in the presentation video - when the presenter stops sharing his screen, the other videos populate the video display;
also, the output video resolution is modified to the highest screen resolution shared during the conference, independently on the output video resolution set by the user; it was done to preserve the quality of the desktop sharing image; if there's no desktop sharing, the output video resolution is respected
2013-06-14 17:50:39 -03:00
Felipe Cecagno
fda4e203f9 extracted FFMPEG_LOG_LEVEL to a module constant, and use it in all FFmpeg commands; now it's easy to increase the log level during development 2013-06-14 17:44:10 -03:00
Felipe Cecagno
8ca4e949aa modified the BigBlueButton.execute method so it can raise an exception when the command passed didn't finish successfully; you can optionally pass fail_on_error=false so it won't raise an exception 2013-06-14 17:39:29 -03:00
Richard Alam
340c7dabf0 Merge pull request #183 from SenecaCDOT-BigBlueButton/fix-meeting-title
the meeting name is now available inside the meeting
2013-06-14 09:33:03 -07:00
Chad Pilkey
14b79c762d the meeting name is now available inside the meeting 2013-06-14 09:11:12 -07:00
jtrobinson
9d7c3e3888 Added necessary code back in to other files. 2013-06-14 08:22:12 -07:00
Richard Alam
b67c6762bc Merge pull request #182 from fcecagno/disabling-network-monitor
Disabled temporarily the network monitor and the bandwidth measurement
2013-06-13 16:28:59 -07:00
Felipe Cecagno
ae7468f9de disabling temporarily the network monitor and the bandwidth estimation measurement 2013-06-13 20:20:08 -03:00
Felipe Cecagno
bf554b75a8 enabling audio_offset tested for h264 2013-06-13 17:24:37 -03:00
Felipe Cecagno
ced61d3fba rap-worker now keeps track of the processing time of a recording; a file called processing_time is generated during the process phase, and this information is added to metadata.xml when the recording is published - this information isn't retrieved by getRecordings because no modification was done on bbb-web to include this information, but at least it's there so the sysadmin can check how long does a recording take to get processed 2013-06-13 17:13:20 -03:00
Felipe Cecagno
53c071ddc3 ref #1516
Refactored the code that generates the video file used in the presentation playback. The problem with the sync of video sources was related to problems of precision inside FFmpeg (sometimes the script runs FFmpeg to trim video files, and the output video file trimmed sometimes was 3+ seconds bigger or smaller than the requested).
Also it's a little more modular, so it will be easier to expand functionality. The processing steps are more explicit now, and the logs are better now to understand the final output.
A new parameter on presentation.yml was added to enable the admin to add an offset for the audio stream - this is mainly useful when the session ran with h264, because the video takes longer for the client to encode, and then in the recording we can see the huge gap between audio and video.
2013-06-13 17:10:52 -03:00
jtrobinson
e4236a0e39 Added logic to support global Poll Menu hotkey to Poll Event Map and Polling Manager 2013-06-13 11:45:00 -07:00
jtrobinson
c61638a04f Added all locale strings for polling. 2013-06-13 11:14:46 -07:00
jtrobinson
abb9cabfb0 Added hotkeys to Voting window. 2013-06-13 10:45:43 -07:00
jtrobinson
d99c3cbbad Added hotkeys to Poll Statistics window 2013-06-13 10:24:53 -07:00
jtrobinson
e4d110b56f Added hotkeys to Instructions window 2013-06-13 10:03:37 -07:00
jtrobinson
fe7b38efc4 Added polling strings to BigBlueButton.mxml, ShortcutEvent, and Shortcut help window. Also merged upstream/master. 2013-06-13 08:32:32 -07:00
Richard Alam
3230af24c9 Merge branch 'master' into upgrade-to-grails-1.3.9 2013-06-12 14:43:28 +00:00
Fred Dixon
37cecc3259 Removed auto focus from joining demo meeting 2013-06-11 17:51:49 -07:00
Fred Dixon
8080c4c969 Simplifying the default welcome presentation 2013-06-11 16:23:19 -07:00
Gustavo Salazar
2483f76ee6 create audio.webm to play it in IE 2013-06-11 17:20:34 -05:00
Gustavo Salazar
e89bb22e9f no need to publish events.xml 2013-06-11 17:02:12 -05:00
Gustavo Salazar
f1cd2f071e publish audio files only if video is not available 2013-06-11 17:00:08 -05:00
Richard Alam
d6297642ba Merge pull request #181 from SenecaCDOT-BigBlueButton/disable-drawing-when-notpresenter
when you lose presenter you lose the ability to draw
2013-06-11 14:47:54 -07:00
Chad Pilkey
1016e1e29a when you lose presenter you lose the ability to draw 2013-06-11 14:36:31 -07:00
Richard Alam
4b7fc8ffc6 Merge pull request #179 from SenecaCDOT-BigBlueButton/poll-tab
Poll tab
2013-06-11 13:18:05 -07:00
Richard Alam
68ca2b333b Merge pull request #159 from SenecaCDOT-BigBlueButton/access-presenter-alert
Added audio alert; when Presentership is moved to or from a screen-reade...
2013-06-11 13:16:38 -07:00
Richard Alam
d901c70963 Merge pull request #180 from SenecaCDOT-BigBlueButton/disable-private-chat
improved disabling private chat so that the whole tab doesn't disappear
2013-06-11 13:15:10 -07:00
Richard Alam
6e53c9496f Merge pull request #178 from SenecaCDOT-BigBlueButton/add-meeting-title
Add meeting title
2013-06-11 13:14:54 -07:00
Chad Pilkey
f61482a987 improved disabling private chat so that the whole tab doesn't disappear 2013-06-11 12:40:36 -07:00
Richard Alam
fb23b44e03 - add JS API to querly list of presentations, display a presentation, and delete a presentation 2013-06-11 18:19:35 +00:00
jtrobinson
eb4897af46 Updated Voting Window. 2013-06-11 10:36:11 -07:00
jtrobinson
1f3e59f914 Removed some code from PollingWindowManager that was interfering with proper tab order. 2013-06-11 08:53:42 -07:00
jtrobinson
d8bb373924 Updated Polling Statistics window 2013-06-11 07:30:35 -07:00
Chad Pilkey
16fbdd9ab5 added config.xml property to control showing the meeting name in the toolbar 2013-06-10 15:08:30 -07:00
Chad Pilkey
468d470f97 meeting title bar is working correctly 2013-06-10 14:36:10 -07:00
jtrobinson
f13ab387bc Updated Instructions window. 2013-06-10 13:27:18 -07:00
jtrobinson
d2ffbea374 Added PollOptions class to allow for either user-defined or default tab order 2013-06-10 12:56:53 -07:00
jtrobinson
7b3144d548 Merged upstream/master. 2013-06-10 10:34:46 -07:00
jtrobinson
b0d3ffeeaa Merged upstream/master. 2013-06-10 09:51:15 -07:00
Chad Pilkey
8533006c6f Merge remote branch 'upstream/master' into add-meeting-title 2013-06-10 09:05:26 -07:00
jtrobinson
fab89990ec Merged upstream/master. 2013-06-10 08:39:39 -07:00
Chad Pilkey
0eef79116e added whiteboardAccess to config.xml template 2013-06-10 08:21:07 -07:00
Chad Pilkey
683096cb1d Partial implementation of meeting title on the toolbar 2013-06-10 08:14:28 -07:00
Felipe Cecagno
ac66d49812 Create the auto scroll feature on the slides thumbnails. The idea is that everytime the slide changes because of the synchronized playback, the thumbnails div will scroll to keep the current thumbnail centered in the div. The feature can be disabled using a checkbox. 2013-06-09 15:11:50 -03:00
Felipe Cecagno
c8f2079e64 When the user clicks on a slide thumbnail, the URL changes to index that moment so if the user copies and shares the URL after click on a slide thumbnail, the URL copied will go directly to the correct moment. 2013-06-09 14:51:38 -03:00
Fred Dixon
5935f8b1b0 More tweeks to the default presentation 2013-06-08 15:48:26 -07:00