kurento_rails 0.1.1 → 0.1.4

data/src/kurento-rails.coffee

@@ -7,7 +7,7 @@
 
 kurentoRailsHelpers = {}
 
-kurentoRailsHelpers.getRailsUrlFromBrowser = () => "#{location.hostname}/websocket"
+kurentoRailsHelpers.getRailsUrlFromBrowser = () => "#{location.hostname + (if location.port then ':' + location.port else '')}/websocket"
 
 kurentoRailsHelpers.generateKurentoVideoUrl = (baseFileLocation, videoName) =>
 	date = new Date()
@@ -78,6 +78,7 @@ class StreamingHelper
 									file_url: file_url
 									sender_rtc: @broadcast.kurentoObjects.webRtcEndpoint.id
 									streaming: true
+								$.extend(streamToBroadcast, @broadcast.kurentoObjects.extraDataToSaveToRails) if @broadcast.kurentoObjects.extraDataToSaveToRails
 								@rails_websocket_dispatcher.trigger 'streams.broadcast', streamToBroadcast, save_to_rails_success, save_to_rails_failure
 
 		#### Broadcast (broadcast)
@@ -90,10 +91,11 @@ class StreamingHelper
 		# - callback: function(error, object); a function you wish to have called upon either successful completion of the streaming setup process, or on the occurence of any errors
 		# 
 		# It should probably be noted that this function not only broadcasts, but also records the stream
-		@broadcast.broadcast = (videoName, videoElement, baseFileLocation = "file:///kurento", callback = null) =>
+		@broadcast.broadcast = (videoName, videoElement, baseFileLocation = "file:///kurento", extraDataToSaveToRails, callback) =>
 			@broadcast.kurentoObjects.currentCallback = callback
 			@broadcast.kurentoObjects.baseFileLocation = baseFileLocation
 			@broadcast.kurentoObjects.videoName = videoName
+			@broadcast.kurentoObjects.extraDataToSaveToRails = extraDataToSaveToRails
 			return onBroadcastingError("You must pass in a valid video tag") if videoElement is null or $(videoElement).prop("tagName").toLowerCase().trim() is not "video"
 			videoElement = $(videoElement)[0] # a little fix to make this work if they used jquery to get the element
 			options = { localVideo: videoElement }
@@ -216,6 +218,7 @@ class StreamingHelper
 		# callback: function(error, object); The function you want to be called upon successful completion of the playback initiation process, or on error
 		@view.live.startViewing = (stream, videoElement, callback = null) =>
 			@view.live.kurentoObjects.callback = callback
+			@view.live.kurentoObjects.videoElement = videoElement
 			return onLiveViewError("You must pass in a valid video tag") if videoElement is null or $(videoElement).prop("tagName").toLowerCase().trim() is not "video"
 			videoElement = $(videoElement)[0]
 			@kurento.getMediaobjectById stream.sender_rtc, (error, webRtcEndpoint) =>
@@ -241,6 +244,9 @@ class StreamingHelper
 			if @view.live.kurentoObjects.webRtcPeer
 				@view.live.kurentoObjects.webRtcPeer.dispose()
 				@view.live.kurentoObjects.webRtcPeer = null
+			if @view.live.kurentoObjects.videoElement
+				@view.live.kurentoObjects.videoElement.src = ''
+				@view.live.kurentoObjects.videoElement = null
 			@view.live.kurentoObjects.pipeline = null if @view.live.kurentoObjects.pipeline
 			@view.live.kurentoObjects.presenterWebRtcEndpoint = null if @view.live.kurentoObjects.presenterWebRtcEndpoint
 			callback() if callback

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kurento_rails
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.4
 platform: ruby
 authors:
 - Andrew Stephenson
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-04-29 00:00:00.000000000 Z
+date: 2016-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -111,6 +111,18 @@ files:
 - Rakefile
 - bin/console
 - bin/setup
+- docs/docco.css
+- docs/kurento-rails.html
+- docs/public/fonts/aller-bold.eot
+- docs/public/fonts/aller-bold.ttf
+- docs/public/fonts/aller-bold.woff
+- docs/public/fonts/aller-light.eot
+- docs/public/fonts/aller-light.ttf
+- docs/public/fonts/aller-light.woff
+- docs/public/fonts/roboto-black.eot
+- docs/public/fonts/roboto-black.ttf
+- docs/public/fonts/roboto-black.woff
+- docs/public/stylesheets/normalize.css
 - kurento_rails.gemspec
 - lib/generators/kurento_rails/install_generator.rb
 - lib/generators/kurento_rails/templates/config/events.rb