Commit Graph

6280 Commits

Author SHA1 Message Date
Guilherme Augusto Dias
8c89024084 Fix issue in multi-segment recording
Correctly draw shapes in multi-segment recordings.
2013-10-07 20:08:14 +00:00
Felipe Cecagno
f49091c260 Merge branch 'record-button' of https://github.com/guilhermedias/bigbluebutton into record-button 2013-10-04 11:26:48 -03:00
Felipe Cecagno
94df8080b8 fixed record button alert position 2013-10-04 11:24:05 -03:00
Felipe Cecagno
8830951ac0 to specify the duration on ffmpeg we use -t instead of -to 2013-10-04 11:04:21 -03:00
Felipe Cecagno
00d0eb7b43 we only to the match between the video events and the record status events AFTER the webcam and deskshare merge 2013-10-04 11:03:49 -03:00
Guilherme Augusto Dias
9d1dd1d8d2 Fix shape/image matching test
Fix iteration range when checking if a shape is within an image
2013-10-02 22:32:16 +00:00
Guilherme Augusto Dias
1b6c5a5b58 Highlight thumbnail
The thumbnail of the first slide starts highlighted
2013-10-02 22:31:10 +00:00
Felipe Cecagno
2572d5eb7a positioned the record button near the other control buttons at the left size 2013-10-02 14:29:57 -03:00
Felipe Cecagno
d8b3375f48 we don't want to archive recordings in which there's no mark to start the recording; it would be the same as if the meeting would be created with record=false - the only difference is that the events are archived to recordings/raw/meeting_id/events.xml, and the recorded .done flag is created as well 2013-10-02 14:18:26 -03:00
Guilherme Augusto Dias
00d4c69f78 Fix audio processing issue
Fix an issue that occurs on processing recordings with no audio
2013-09-27 19:26:33 +00:00
Felipe Cecagno
322176ddf3 Merge branch 'record-button' of https://github.com/guilhermedias/bigbluebutton into record-button
Conflicts:
	record-and-playback/presentation/scripts/publish/presentation.rb
2013-09-26 13:06:15 -03:00
Guilherme Augusto Dias
99b17e6f58 Change shape timestamps generation
The timestamps of shapes drawn during a non recording period are being correctly generated.
2013-09-26 13:32:55 +00:00
Felipe Cecagno
4abf4f76d4 if the slide time is 0 and you click on his thumbnail, you will want to see &t=0s, not &t= 2013-09-25 01:32:16 -03:00
Felipe Cecagno
bce20f4112 fixed the issue commented on the previous commit, about losing the recording flag when the last participant leaves the room 2013-09-25 01:27:32 -03:00
Felipe Cecagno
32b52fefb8 start and stop recording marks are being considered in all medias (audio, video and deskshare); still needs to figure out the inconsistency when the last participant leaves the conference while it's being recorded, but couple of seconds later another participant joins the meeting; the problem is that after the last user leaves the conference, the scope is deleted so the recording flag is lost, and when the scope is created again, the recording flag has the default value, that is false; also, what should we do if the user doesn't click on the recording button? how to differentiate recordings made in a version with or without the recording button? 2013-09-25 00:34:15 -03:00
Felipe Cecagno
09657c206c fixed the exceptions thrown when an Alert box is showed 2013-09-24 18:03:58 -03:00
Felipe Cecagno
cf8b31591c this commit is an unfinished work; the new code that generates the audio and video files in the recording is being adapted to take into account the recording marks; the audio is done, but video and desktop sharing is still missing 2013-09-24 18:03:12 -03:00
Felipe Cecagno
aa597fe985 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into record-button-client
Conflicts:
	bigbluebutton-client/branding/default/style/css/BBBDefault.css
	bigbluebutton-client/src/org/bigbluebutton/main/views/MainToolbar.mxml
	record-and-playback/core/lib/recordandplayback.rb
	record-and-playback/core/lib/recordandplayback/generators/audio_processor.rb
	record-and-playback/core/lib/recordandplayback/generators/events.rb
	record-and-playback/core/lib/recordandplayback/generators/video.rb
	record-and-playback/presentation/scripts/publish/presentation.rb
2013-09-24 15:03:44 -03:00
Fred Dixon
0b9cfb591c Merge pull request #263 from gugat/bbbrecord081
update bbb-record utility
2013-09-23 17:42:16 -07:00
Gustavo
0390c2c3c4 bbb-record update version 2013-09-23 23:16:04 +00:00
Gustavo
3e01ab5d29 republish only for matterhorn integration 2013-09-23 23:15:07 +00:00
Gustavo
6acbc14103 separate rebuild and rebuild all 2013-09-23 22:36:53 +00:00
Gustavo
d03114846a angle brackets for params 2013-09-23 21:51:46 +00:00
Fred Dixon
d9bfdaeb73 Merge pull request #262 from gugat/locales08
Update locales
2013-09-23 14:47:07 -07:00
Felipe Cecagno
33d98bbff2 implemented the record button both client-side and server-side; still needs more work on the processing scripts; still needs to update the record button icons 2013-09-23 18:33:30 -03:00
Gustavo
d8e1bce801 Update locales 2013-09-23 20:46:29 +00:00
Richard Alam
b1ae469c8a - skip check for cam setting even when starting sharing manually 2013-09-23 19:22:34 +00:00
Richard Alam
c1d30dc72b - add config param to skip camera settings check 2013-09-23 15:24:07 +00:00
Felipe Cecagno
9c512931e0 starting to implement the client-side of the record button; nothing yet was modified on bigbluebutton-apps 2013-09-19 17:53:48 -03:00
Felipe Cecagno
b5b81c1c4d refactored a little bit the function translateTimestamp; the images that are never displayed aren't included on the svg file anymore; still have to figure out the issue with the shapes made BEFORE start the recording - for now we cannot differentiate shapes made on the current slide and the ones made on a previous slide before start the recording 2013-09-19 15:22:22 -03:00
Richard Alam
252d7129a7 - fix race condition where video share button doesn't show up somtimes when presenterShareOnly=true 2013-09-19 17:27:30 +00:00
Felipe Cecagno
54a34b4475 Merge branch 'record-button' of github.com:fcecagno/bigbluebutton into record-button
Conflicts:
	record-and-playback/core/lib/recordandplayback/generators/events.rb
2013-09-18 18:02:18 -03:00
Felipe Cecagno
237268424f the timestamps of the recording events are normalized now, matching the recording marks; still need more testing when there are multiple start-stop recording events; the whiteboard actions are already working, including the slides, but slides that are outside of the recording period are still being loaded in the svg file (#TODO) 2013-09-18 17:54:51 -03:00
Guilherme Augusto Dias
1bd0d7ee4a Draw multiple shapes
Playback script supports drawing multiple shapes at the same time
2013-09-18 17:59:13 +00:00
Richard Alam
fc4382d626 - fix problem where no one can share when presenterShareOnly is set to TRUE 2013-09-16 21:27:47 +00:00
Richard Alam
9f8f7fa419 Merge pull request #251 from SenecaCDOT-BigBlueButton/fix-issue-1611
removed the colour change from the chat item renderer and improved the layout when there's a long name
2013-09-11 12:00:13 -07:00
Chad Pilkey
dfe2bfd6de removed the colour change from the chat item renderer and improved the layout when there's a long name 2013-09-09 14:27:10 -07:00
Fred Dixon
6b95448865 Merge pull request #249 from SenecaCDOT-BigBlueButton/fix-logout-window-localisation
added two strings in the log out window to locales
2013-09-04 15:11:04 -07:00
Chad Pilkey
dfc444ab6f added two strings in the log out window to locales 2013-09-04 15:01:23 -07:00
Nadia Noori
c2c344ed79 Changing lable to RC1 2013-09-04 14:24:19 -04:00
Richard Alam
d514465e3b Merge pull request #246 from bigbluebutton/fix-logout-url-call
Logout URL was never called when API signOut call fail.
2013-09-04 08:26:26 -07:00
Fred Dixon
be5c2c5433 Merge pull request #248 from SenecaCDOT-BigBlueButton/fix-chattab-localization
Fix chattab localization
2013-09-03 15:36:33 -07:00
Chad Pilkey
e8ef9f3b1a added check to make sure tabs exist 2013-09-03 15:34:45 -07:00
Chad Pilkey
6ab6ec3ec3 the Public and Option chat tabs now match the selected locale at all times 2013-09-03 15:24:52 -07:00
Gustavo Salazar
2007d6d7bb delete transifex dir in locales 2013-09-02 13:59:36 -05:00
Gustavo Salazar
214cef8c1c Merge pull request #247 from jent46/master
Update locales
2013-09-02 11:05:42 -07:00
jent46
8e8e162c7c Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton 2013-09-02 10:45:34 -07:00
jent46
8561c02d18 update locales 2013-09-02 10:44:52 -07:00
Tiago Daniel Jacobs
3d9cd8b63d Logout URL was never called when API signOut call fail. 2013-08-30 21:17:44 -03:00
Fred Dixon
7949c6af9a Merge pull request #245 from jent46/master
fix issue in the demo10_helper.
2013-08-30 17:06:35 -07:00