From 100615e25f777b422fa200f717c0e117ad6d9365 Mon Sep 17 00:00:00 2001
From: Okechi <okechi@Okechis-Mac-mini.local>
Date: Fri, 4 Mar 2016 12:36:03 -0500
Subject: [PATCH] play, pause, and general streaming working in currently
 playing. will work on choosing next host and repeating

---
 GetHip/CurrentlyPlayingViewController.swift | 47 +++++++++++++++------
 GetHip/LoadingPartyViewController.swift     | 11 +++--
 GetHip/Main.storyboard                      |  4 +-
 3 files changed, 42 insertions(+), 20 deletions(-)

diff --git a/GetHip/CurrentlyPlayingViewController.swift b/GetHip/CurrentlyPlayingViewController.swift
index 19882b8..a6400ff 100644
--- a/GetHip/CurrentlyPlayingViewController.swift
+++ b/GetHip/CurrentlyPlayingViewController.swift
@@ -18,7 +18,7 @@ class CurrentlyPlayingViewController: UIViewController, PartyServiceManagerDeleg
     var frnds: [FriendData] = []
     var requestData: [FriendData] = []
     var audioPlayer: AVPlayer!
-    var playing = false
+    var playing = true
     var timer = NSTimer()
     
     //controller data
@@ -37,17 +37,28 @@ class CurrentlyPlayingViewController: UIViewController, PartyServiceManagerDeleg
         self.audioPlayer.volume = sender.value
     }
     @IBAction func playPauseFav(sender: UIButton){
-        if(playing == true){
-            self.audioPlayer.pause()
-            self.playing = false
-            self.ppfButton.setBackgroundImage(UIImage(named: "Play-52.png"), forState: UIControlState.Normal)
-            
-        }else{
-            self.audioPlayer.play()
-            self.playing = true
-            self.ppfButton.setBackgroundImage(UIImage(named: "Pause-52.png"), forState: UIControlState.Normal)
-            
+        if (self.party.role == PeerType.Host_Creator){
+            if(playing == true){
+                self.audioPlayer.pause()
+                for peer in self.party.session.connectedPeers {
+                    var dictionary: [String: String] = ["sender": self.party.myPeerID.displayName, "instruction": "pause_stream"]
+                    self.party.sendInstruction(dictionary, toPeer: peer as! MCPeerID)
+                }
+                self.playing = false
+                self.ppfButton.setBackgroundImage(UIImage(named: "Play-52.png"), forState: UIControlState.Normal)
+                
+            }else{
+                self.audioPlayer.play()
+                self.playing = true
+                self.ppfButton.setBackgroundImage(UIImage(named: "Pause-52.png"), forState: UIControlState.Normal)
+                for peer in self.party.session.connectedPeers {
+                    var dictionary: [String: String] = ["sender": self.party.myPeerID.displayName, "instruction": "resume_stream"]
+                    self.party.sendInstruction(dictionary, toPeer: peer as! MCPeerID)
+                }
+                
+            }
         }
+        
     }
     
     
@@ -72,8 +83,11 @@ class CurrentlyPlayingViewController: UIViewController, PartyServiceManagerDeleg
             self.audioPlayer.volume = self.volCtrl.value
             self.maxLabel.text = String(stringInterpolationSegment: self.audioPlayer.currentItem.duration.value)
             self.party.delegate = self
-            //self.audioPlayer.play()
-            //self.timer = NSTimer.scheduledTimerWithTimeInterval(1, target: self, selector: Selector("updateLabels"), userInfo: nil, repeats: true)
+            for peer in self.party.session.connectedPeers {
+                self.party.outputStreamers[peer.displayName]?.start()
+            }
+            self.audioPlayer.play()
+            self.timer = NSTimer.scheduledTimerWithTimeInterval(1, target: self, selector: Selector("updateLabels"), userInfo: nil, repeats: true)
         }else if (self.party.role == PeerType.Guest_Invited){
             
             self.songImg.image = self.party.currentSongIMG
@@ -82,6 +96,7 @@ class CurrentlyPlayingViewController: UIViewController, PartyServiceManagerDeleg
             println(self.titleLabel.text)
             self.artistAndAlbumLabel.text = (self.party.currentSongArtistAlbum)
             self.party.delegate = self
+            self.ppfButton.hidden = true
                         
             
             
@@ -169,7 +184,11 @@ extension CurrentlyPlayingViewController: PartyServiceManagerDelegate {
             var dictionary: [String: String] = ["sender": self.party.myPeerID.displayName, "instruction": "disconnect"]
             self.party.sendInstruction(dictionary, toPeer: fromPeer)
         }else{
-            
+            if(instruction == "pause_stream"){
+                self.party.inputStreamer.pause()
+            }else if(instruction == "resume_stream"){
+                self.party.inputStreamer.resume()
+            }
         }
             
         
diff --git a/GetHip/LoadingPartyViewController.swift b/GetHip/LoadingPartyViewController.swift
index e0d7e6e..6918c53 100644
--- a/GetHip/LoadingPartyViewController.swift
+++ b/GetHip/LoadingPartyViewController.swift
@@ -128,11 +128,14 @@ class LoadingPartyViewController: UIViewController, UICollectionViewDataSource,
                         }
                     }
                 }else{
-                    var dictionary: [String: String] = ["sender": self.party.myPeerID.displayName, "instruction": "start_party"]
-                    self.party.sendInstruction(dictionary, toPeer: joinedPeer! )
                     
-                    //start streaming to connected peers
-                    self.party.outputStreamers[joinedPeer!.displayName]!.start()
+                        var dictionary: [String: String] = ["sender": self.party.myPeerID.displayName, "instruction": "start_party"]
+                        self.party.sendInstruction(dictionary, toPeer: joinedPeer! )
+                        
+                        //start streaming to connected peers
+                        //self.party.outputStreamers[joinedPeer!.displayName]!.start()
+                    
+                    
                     
                 }
                 
diff --git a/GetHip/Main.storyboard b/GetHip/Main.storyboard
index ee06a18..a8a3fb1 100644
--- a/GetHip/Main.storyboard
+++ b/GetHip/Main.storyboard
@@ -1307,7 +1307,7 @@
                             </button>
                             <button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="sFb-YR-QlX">
                                 <rect key="frame" x="138" y="505" width="44" height="43"/>
-                                <state key="normal" backgroundImage="Play-52.png">
+                                <state key="normal" backgroundImage="Pause-52.png">
                                     <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
                                 </state>
                                 <connections>
@@ -1634,7 +1634,7 @@
         <image name="Lower.png" width="7" height="10"/>
         <image name="No Friend Requests i5.png" width="320" height="568"/>
         <image name="Party.png" width="81" height="41"/>
-        <image name="Play-52.png" width="52" height="52"/>
+        <image name="Pause-52.png" width="52" height="52"/>
         <image name="Raise.png" width="14" height="13"/>
         <image name="Rectangle 10 + Change Photo + voice_presentation copy + voice_presentation copy 2 + voice_presentation + Music 2 + Music 2.png" width="203" height="153"/>
         <image name="Send Invites Button.png" width="375" height="46"/>