open stuff

web/app/assets/javascripts/react-components/PopupMediaControls.js.jsx.coffee

@@ -495,7 +495,7 @@ mixins.push(Reflux.listenTo(UserStore, 'onUserChanged'))
 
     @props.windowUnloaded()
 
-    SessionActions.closeMedia(false) unless window.DontAutoCloseMedia
+    MixerActions.closeMedia(false) unless window.DontAutoCloseMedia
 
   toggleMyMixes: (e) ->
     e.preventDefault()

web/app/assets/javascripts/react-components/SessionMediaTracks.js.jsx.coffee

@@ -1,6 +1,7 @@
 context = window
 rest = context.JK.Rest()
 SessionActions = @SessionActions
+MixerActions = @MixerActions
 JamTrackActions = @JamTrackActions
 MIX_MODES = context.JK.MIX_MODES
 EVENTS = context.JK.EVENTS
@@ -28,7 +29,7 @@ ChannelGroupIds = context.JK.ChannelGroupIds
         SessionActions.downloadingJamTrack(false)
         @setState({downloadJamTrack: null})
 
-      SessionActions.closeMedia.trigger(true)
+      MixerActions.closeMedia.trigger(true)
 
 
   #inputsChangedProcessed: (state) ->
@@ -43,7 +44,7 @@ ChannelGroupIds = context.JK.ChannelGroupIds
     e.preventDefault()
 
     logger.debug("SessionMediaTracks.closeAudio")
-    SessionActions.closeMedia(false)
+    MixerActions.closeMedia(false)
 
   cancelDownloadJamTrack: (e) ->
     e.preventDefault()

web/app/assets/javascripts/react-components/stores/MixerStore.js.coffee

@@ -1,6 +1,7 @@
 context = window
 logger = context.JK.logger
 SessionActions = context.SessionActions
+JamTrackActions = context.JamTrackActions
 MIX_MODES = context.JK.MIX_MODES
 rest = context.JK.Rest()
 
@@ -41,6 +42,7 @@ rest = context.JK.Rest()
       this.listenTo(context.MixerActions.deadUserRemove, this.onDeadUserRemove)
       this.listenTo(context.MixerActions.missingPeerMixer, this.onMissingPeerMixer)
       this.listenTo(context.MixerActions.clientsWithAudio, this.onClientsWithAudio)
+      this.listenTo(context.MixerActions.closeMedia, this.onCloseMedia)
 
       context.JK.HandleVolumeChangeCallback2 = @handleVolumeChangeCallback
       context.JK.HandleMetronomeCallback2 = @handleMetronomeCallback
@@ -179,40 +181,50 @@ rest = context.JK.Rest()
 
   # codeInitiated means the user did not initiate this
     onCloseMedia: (codeInitiated) ->
-
-      logger.debug("SessionStore: onCloseMedia", codeInitiated)
+      logger.debug("MixerStore: onCloseMedia", codeInitiated)
       if @session.recordedTracks()
-        @closeRecording()
+        @closeRecording(codeInitiated)
       else if @session.jamTracks() || @session.downloadingJamTrack
-        @closeJamTrack()
+        @closeJamTrack(codeInitiated)
       else if @session.backingTrack() && @session.backingTrack().path
-        @closeBackingTrack()
+        @closeBackingTrack(codeInitiated)
       else if @session.isMetronomeOpen()
-        @closeMetronomeTrack()
+        @closeMetronomeTrack(codeInitiated)
       else
         logger.error("don't know how to close open media", @session) unless codeInitiated
 
     closeRecording: () ->
-      logger.debug("closing recording")
+      logger.debug("closing recording");
 
       if !@mixers.mediaSummary.isOpener
-        logger.debug("not closing recording")
+        logger.debug("not recordingas not opener")
+        return
 
-      rest.stopPlayClaimedRecording({id: @currentSessionId, claimed_recording_id: @currentSession.claimed_recording.id})
-      .done((response) =>
-        #sessionModel.refreshCurrentSession(true);
-        # update session info
-        SessionActions.updateSession(response)
-      )
-      .fail((jqXHR) =>
-        @app.notify({
-          "title": "Couldn't Stop Recording Playback",
-          "text": "Couldn't inform the server to stop playback. msg=" + jqXHR.responseText,
-          "icon_url": "/assets/content/icon_alert_big.png"
-        })
-      )
+      SessionActions.closeMedia(codeInitiated)
+
+    closeMetronomeTrack:(codeInitiated) ->
+      logger.debug("closing metronome")
+
+      SessionActions.closeMedia(codeInitiated)
+
+    closeBackingTrack: (codeInitiated) ->
+      logger.debug("closing backing track");
+
+      if !@mixers.mediaSummary.isOpener
+        logger.debug("not closing backing as not opener")
+        return
+
+      SessionActions.closeMedia(codeInitiated)
+
+    closeJamTrack: (codeInitiated) ->
+      logger.debug("closing jam track");
+
+      if !@mixers.mediaSummary.isOpener
+        logger.debug("not closing jamtrack as not opener")
+        return
+
+      SessionActions.closeMedia(codeInitiated)
 
-      context.jamClient.CloseRecording()
 
     onDeadUserRemove: (clientId) ->
       return unless @session.inSession()