BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
19,416 Commits 13 Branches 260 Tags 1.1 GiB
0bc3a06837
Commit Graph

130 Commits

Author SHA1 Message Date
Richard Alam
8f110c74a4 - try to fix issue where sharing doesn't stop when paused and jws crashes 2016-08-20 21:42:32 +00:00
Richard Alam
5ccdbb085b - make late joiner view screen share stream 2016-08-20 19:17:54 +00:00
Richard Alam
050ecee572 - start, pause, stop screen sharing properly 2016-08-20 17:56:01 +00:00
Richard Alam
a82fcd7f7c - end jws when exception occurs 2016-08-19 15:20:04 +00:00
Richard Alam
8e6d7a0274 - remove dialog when jws stops 2016-08-19 15:19:32 +00:00
Richard Alam
46a7723f68 - remove commented out code. 2016-08-19 15:19:09 +00:00
Richard Alam
f42af1565a - stop jws when client crashes. 2016-08-19 15:05:57 +00:00
Richard Alam
c02170f377 - handle timeout when querying screen sharing session. 2016-08-18 21:34:57 +00:00
Richard Alam
b591106aaa - try to detect if the flash client and the jws app are still alive. If one of them 
if dead, end screen sharing.
 2016-08-18 19:49:32 +00:00
Richard Alam
8103162d61 - try to handle getting disconnected. 2016-08-17 21:51:35 +00:00
Richard Alam
1da50feb5e - cleanup 2016-08-17 18:44:08 +00:00
Richard Alam
6aab83589a Merge branch 'screenshare-1.1' of https://github.com/antobinary/bigbluebutton into antobinary-screenshare-1.1 
Conflicts:
	bbb-screenshare/app/src/main/scala/org/bigbluebutton/app/screenshare/ScreenShareApplication.scala
	bbb-screenshare/app/src/main/scala/org/bigbluebutton/app/screenshare/server/sessions/Screenshare.scala
	bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/services/MessageReceiver.as
 2016-08-17 18:40:28 +00:00
Richard Alam
dd774fabeb - add some comments. 2016-08-17 14:55:51 +00:00
Richard Alam
cc80f1c2ff - trigger starting of screen capture from the server side. 2016-08-16 21:01:41 +00:00
Richard Alam
080a3557c3 - stop jws when user that's sharing gets disconnected 2016-08-16 20:21:29 +00:00
Richard Alam
59d192ee62 - make sure there is only one screen sharing in a meeting. 2016-08-16 17:18:21 +00:00
Richard Alam
12a383cb9d - close jws app when sharing is cancelled (not started) 2016-08-15 21:50:38 +00:00
Richard Alam
9945cb7c5b - stop sharing from the screen share toolbar button. 2016-08-15 20:56:29 +00:00
Richard Alam
9c7759dc73 - display screen share stream 2016-08-15 18:25:56 +00:00
Richard Alam
c3a3bd89bf - generate new streamId from server side when restarting screen sharing. 2016-08-15 17:56:49 +00:00
Anton Georgiev
f7cb97737d ask akka-apps if allowed to start screenshare 2016-08-11 19:18:56 +00:00
Richard Alam
673baa1c84 - reinit restart button label in client. 2016-08-10 21:18:53 +00:00
Richard Alam
4f996890ec - reinit screen share 2016-08-10 21:18:28 +00:00
Richard Alam
bcd34dd57c - add note not to call grabber.stop() 2016-08-10 21:18:00 +00:00
Richard Alam
6e177ef74f Start, pause, stop screen sharing. 2016-08-10 20:48:55 +00:00
Richard Alam
68916c95f6 Allow restart of screen share. 2016-08-10 20:37:19 +00:00
Richard Alam
0138d98f22 - don't exit when pausing screen sharing. 2016-08-10 19:18:49 +00:00
Anton Georgiev
5eccf9297b add send AllowUserToShareDesktopRequest; add bbb-common-messages 2016-08-10 16:10:01 +00:00
Anton Georgiev
c6443f4ed5 set jedis with host+port 2016-08-09 21:58:20 +00:00
Richard Alam
83c77f5746 Pause screenshare stream 
Add hook to pause screen sharing.
 2016-08-08 20:24:46 +00:00
Richard Alam
4cb817ada5 Logging 
Add more logging to determine if user has successfully shared his desktop or not.
 2016-08-05 17:47:57 +00:00
Richard Alam
ec608a37ff Cleanup 
Reformat code by running dos2unix.
 2016-08-03 18:49:30 +00:00
Richard Alam
3d0b1b1222 - remove userId attribute on defunct connection when user auto-reconnects. 2016-08-03 18:46:41 +00:00
Richard Alam
5906a0fc7b Cleanup 
Removed old jar files.
 2016-08-02 15:10:18 +00:00
Richard Alam
61c6a56d13 Update jws ffmpeg lib jars 
Updated ffmpeg lib jars, specifically linux jars as the old ones were broken.
 2016-08-02 15:00:51 +00:00
Richard Alam
97bbb3acff Cleanup logging 
Comment out update logs to minimize noise in the logs.
 2016-07-20 20:03:48 +00:00
Richard Alam
c0397a0081 Screenshare issue when starting first time on Mac 
Fred is still running into the issue. Add more logs to figure out the sequence
 of events when sharing starts.
 2016-07-19 19:17:27 +00:00
Richard Alam
dfc58e2a15 - try to fix issue where when sharing desktop on mac for the first time, it fails 
with a network connection exception.
 2016-07-19 16:31:26 +00:00
Richard Alam
1d5073cfd2 - check if the need to use https to connect to java webstart servlet. 2016-07-14 17:31:44 +00:00
Richard Alam
5163d2519c - forgot to add jedis jar intobuild which results in wrting recording event to redis failing. 2016-06-20 18:23:10 +00:00
Richard Alam
a9404040e6 Merge pull request #3181 from antobinary/screenshare-with-cursor-capture3 
fix timestamps for recording purposes
 2016-06-20 10:27:07 -04:00
Richard Alam
977b3dc046 - remove MANIFEST from ffmpeg.jar as it declares dependencies to all platform's native libs. 
This triggers downloading of mac, linux jars even if you are running on windows.
 2016-06-16 17:25:16 +00:00
Richard Alam
66414eae68 - clean up removing logs and removing javacpp from the build 2016-06-15 20:11:59 +00:00
Richard Alam
e484aac978 - do not manually search for the native libraries as it causes 
startup time to take longer
 2016-06-15 18:34:34 +00:00
Richard Alam
e9acf88f9f - cache the jar files 2016-06-13 19:48:24 +00:00
Richard Alam
441210d954 - include javacpp into main app source so we don't need to load another jar 
which hopefully improves screenshare startup time.
 2016-06-13 17:13:01 +00:00
Richard Alam
1a9f5f0249 - improve webstart searching time for native libraries 2016-06-08 17:30:13 -04:00
Richard Alam
9408316e53 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into update-screenshare-ffmpeg-jars 
Conflicts:
	bbb-screenshare/app/jws/lib/ffmpeg-windows-x86.jar
	bbb-screenshare/app/jws/lib/ffmpeg-windows-x86_64.jar
	bbb-screenshare/app/jws/lib/ffmpeg.jar
	bbb-screenshare/app/jws/lib/javacpp.jar
	bbb-screenshare/app/jws/lib/javacv-screenshare-0.0.1.jar
	bbb-screenshare/app/jws/lib/javacv.jar
 2016-06-02 21:14:59 +00:00
Richard Alam
0fb101c9de - bring in classes from javacv jar instead of adding the jar as a 
dependency. The javacv.jar has also other jar dependencies that
   webstart will try to download when running.
 2016-06-02 20:58:20 +00:00
Richard Alam
bb330487e5 - updatting ffmpeg jars to javacv 1.2 release 2016-06-02 20:56:52 +00:00
Richard Alam
6695883fe5 - update screenshare jws jar libraries 2016-05-30 18:41:49 +00:00
Anton Georgiev
dd075faa2e config updates 2016-05-27 14:30:16 -04:00
Richard Alam
dd0b1248e5 Clean up 
Remove unneeded ffmpeg jar files.
 2016-03-31 15:20:00 +00:00
Richard Alam
be050216b0 Updating screenshare 
Updating Red5 triggered updating of ffmpeg jars for screensharing.
 2016-03-30 21:18:39 +00:00
Richard Alam
53dc204e8d Update to Java 8 
Change dependencies to build against latest red5 to upgrade to java 8
 2016-03-24 18:54:51 +00:00
Anton Georgiev
3b191aef6c fix timestamps for recording purposes 2016-03-16 20:10:00 +00:00
Anton Georgiev
b6c7b49084 use ActorLogging for the actors 2016-03-14 17:29:09 +00:00
Anton Georgiev
efa70d02c6 fixed issue with late joiners 2016-03-11 22:34:53 +00:00
Anton Georgiev
caa5686b70 fix bug with keepAlive failure 2016-03-11 22:25:51 +00:00
Anton Georgiev
8babeef291 cleanup 2016-03-11 19:25:12 +00:00
Anton Georgiev
c2038033e9 handle other messages requiring response in java 2016-03-11 15:42:33 +00:00
Anton Georgiev
b0631b76c5 handle ScreenShareInfo 2016-03-10 21:45:47 +00:00
Anton Georgiev
ea6f5a4d44 more renaming 2016-03-10 20:08:58 +00:00
Anton Georgiev
5ae59b9197 rename actor classes 2016-03-10 19:49:50 +00:00
Anton Georgiev
be8e7f3d95 dealing with SSA->SS->SSA messages 2016-03-10 19:31:52 +00:00
Anton Georgiev
b3859040a9 add gson lib; jnlp deploy commands 2016-03-08 22:58:38 +00:00
Anton Georgiev
54d72b2b9a direct call to parent actor 2016-03-08 22:56:40 +00:00
Anton Georgiev
b3d7234d0b wrap ScreenshareSession into ActiveSession 2016-03-08 16:24:29 +00:00
Anton Georgiev
73415255eb add a wrapper for MeetingActor 2016-03-07 23:14:33 +00:00
Anton Georgiev
259c68f2c8 working on implementing the hier. actor system 2016-03-07 22:24:08 +00:00
Anton Georgiev
1a432723a6 akka actors in a system; compiles 2016-03-05 23:03:26 +00:00
Anton Georgiev
146d28b460 temporarily simplify; use SBT 2016-03-05 19:24:47 +00:00
Richard Alam
56ce95ed9b - forgot to push jar file 2016-02-26 18:07:50 +00:00
Richard Alam
db1427e606 - add ffmpeg linux x86 jar 2016-02-26 16:50:23 +00:00
Richard Alam
d64f20cb63 - add working jars for linux-x86_64 and mac os x 2016-02-23 15:31:48 +00:00
Richard Alam
cb6ecc5566 - ignore only certain lib/ dir 2016-02-17 18:40:06 +00:00
Richard Alam
eff5e7c0f6 - add ffmpeg jars 2016-02-17 18:39:45 +00:00
Richard Alam
86323e2c1d - add new mac osx jar 2016-02-17 16:59:55 +00:00
Richard Alam
86ec20ae6a - setup all JavaCV jar files 
- make the window not movable when sharing because ffmpeg doesn't adjust x.y coordinates after
   sharing has started
 2016-02-11 19:50:23 +00:00
Richard Alam
bd30fd8c6f - new screenshare red5 app 2016-02-10 19:53:01 +00:00