Skip to content

Commit

Permalink
remove unnecessary adbe-live-event
Browse files Browse the repository at this point in the history
  • Loading branch information
trshafer committed Jan 26, 2015
1 parent bfc1ba1 commit 917fe30
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion src/publish_stream.coffee
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ getPublisher = (domNode, publishOptions, cb)->
getScript urlWithProtocol('ajax.googleapis.com/ajax/libs/swfobject/2.2/swfobject.js'), swfObjectCallbackToLoadPublisher(domNode, publishOptions, cb)

generateStreamName = (stream, password)->
"#{stream.streamName}?#{password}&adbe-live-event=#{stream.streamName}"
"#{stream.streamName}?#{password}"


userOrDefault = (userOptions, key)->
Expand Down
6 changes: 3 additions & 3 deletions test/api_bridge_test.coffee
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ describe 'ApiBridge', ->
streamName:"streamName"
play:
hls:"http://hls.cine.io/cines/streamName/streamName.m3u8"
rtmp:"rtmp://fml.cine.io/20C45E/cines/streamName?adbe-live-event=streamName"
rtmp:"rtmp://fml.cine.io/20C45E/cines/streamName"

@xhrStub = sinon.stub(ajax, 'JSONP').yieldsTo("success", successfulResponse)

Expand Down Expand Up @@ -51,7 +51,7 @@ describe 'ApiBridge', ->
streamName:"streamName"
play:
hls:"http://hls.cine.io/cines/streamName/streamName.m3u8"
rtmp:"rtmp://fml.cine.io/20C45E/cines/streamName?adbe-live-event=streamName"
rtmp:"rtmp://fml.cine.io/20C45E/cines/streamName"

describe 'second call', ->
it 'does not make a second ajax call', (done)->
Expand All @@ -72,7 +72,7 @@ describe 'ApiBridge', ->
streamName:"streamName"
play:
hls:"http://hls.cine.io/cines/streamName/streamName.m3u8"
rtmp:"rtmp://fml.cine.io/20C45E/cines/streamName?adbe-live-event=streamName"
rtmp:"rtmp://fml.cine.io/20C45E/cines/streamName"
done(err)

describe 'nearestServer', ->
Expand Down
2 changes: 1 addition & 1 deletion test/play_stream_test.coffee
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ describe 'PlayStream', ->
streamName:"streamName"
play:
hls:"http://hls.cine.io/cines/streamName/streamName.m3u8"
rtmp:"rtmp://fml.cine.io/20C45E/cines/streamName?adbe-live-event=streamName"
rtmp:"rtmp://fml.cine.io/20C45E/cines/streamName"

@xhrStub = sinon.stub(ajax, 'JSONP').yieldsTo("success", successfulResponse)

Expand Down
6 changes: 3 additions & 3 deletions test/publish_stream_test.coffee
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ describe 'PublishStream', ->
streamName:"streamName"
play:
hls:"http://hls.cine.io/cines/streamName/streamName.m3u8"
rtmp:"rtmp://fml.cine.io/20C45E/cines/streamName?adbe-live-event=streamName"
rtmp:"rtmp://fml.cine.io/20C45E/cines/streamName"
@nearestServerCalled = false
@streamDetailsCalled = false
jsonpResponder = (options)=>
Expand Down Expand Up @@ -251,7 +251,7 @@ describe 'PublishStream', ->
serverURL: "rtmp://publish-sfo1.cine.io:1936/live"
streamFPS: 15
streamHeight: 404
streamName: "streamName?thePassword&adbe-live-event=streamName"
streamName: "streamName?thePassword"
streamWidth: 720
videoQuality: 90
embedTimecode: true
Expand All @@ -267,7 +267,7 @@ describe 'PublishStream', ->
serverURL: "rtmp://publish-sfo1.cine.io:1936/live"
streamFPS: 20
streamHeight: 900
streamName: "streamName?thePassword&adbe-live-event=streamName"
streamName: "streamName?thePassword"
streamWidth: 1600
videoQuality: 70
embedTimecode: false
Expand Down

0 comments on commit 917fe30

Please sign in to comment.