From 2d0ee54191f4b269bd7f77ecaf2821591b433e9e Mon Sep 17 00:00:00 2001
From: Okechi <okechi@Okechis-Mac-mini.local>
Date: Sat, 5 Mar 2016 01:03:09 -0500
Subject: [PATCH] backup

---
 GetHip/CurrentlyPlayingViewController.swift |  1 -
 GetHip/HomeScreenViewController.swift       | 23 ++++++++++++++++++---
 GetHip/LoadingPartyViewController.swift     |  1 -
 GetHip/PartyServiceManager.swift            |  4 ++++
 GetHip/TestInviteFriendsController.swift    | 22 ++++++++++----------
 5 files changed, 35 insertions(+), 16 deletions(-)

diff --git a/GetHip/CurrentlyPlayingViewController.swift b/GetHip/CurrentlyPlayingViewController.swift
index a6400ff..14d9bab 100644
--- a/GetHip/CurrentlyPlayingViewController.swift
+++ b/GetHip/CurrentlyPlayingViewController.swift
@@ -74,7 +74,6 @@ class CurrentlyPlayingViewController: UIViewController, PartyServiceManagerDeleg
         // Do any additional setup after loading the view.
         
         if(self.party.role == PeerType.Host_Creator){
-            
             self.audioPlayer = AVPlayer(URL: self.party.currentSong.valueForProperty(MPMediaItemPropertyAssetURL) as! NSURL)
             
             self.songImg.image = self.party.currentSong.valueForProperty(MPMediaItemPropertyArtwork).imageWithSize(songImg.frame.size)
diff --git a/GetHip/HomeScreenViewController.swift b/GetHip/HomeScreenViewController.swift
index 0d9a030..ed5ad94 100644
--- a/GetHip/HomeScreenViewController.swift
+++ b/GetHip/HomeScreenViewController.swift
@@ -42,11 +42,15 @@ class HomeScreenViewController: UIViewController, PartyServiceManagerDelegate {
         if(self.firstTime == true){
             self.partyData.setPeerID((self.userData[0].displayName))
             self.partyData.initializeSession()
-
-            self.partyData.setAdvertiser()
             
             //start peer-to-peer advertising
+            self.partyData.setAdvertiser()
             self.partyData.startListening()
+            
+            //start browsing for peers
+            self.partyData.setBrowser()
+            self.partyData.startBrowser()
+            
             self.partyData.delegate = self
             self.firstTime = false
         }
@@ -137,7 +141,20 @@ class HomeScreenViewController: UIViewController, PartyServiceManagerDelegate {
 
 extension HomeScreenViewController: PartyServiceManagerDelegate {
     func foundPeer() {
-        
+        for foundPeer in self.partyData.foundPeers {
+            for friend in self.friendData {
+                if foundPeer.displayName == friend.displayName {
+                    for(index, aFriend) in enumerate(self.friendData) {
+                        if aFriend.displayName == friend.displayName {
+                            self.partyData.isInvitable[index] = true
+                            self.partyData.invitableCount++
+                            
+                            break
+                        }
+                    }
+                }
+            }
+        }
     }
     
     func lostPeer() {
diff --git a/GetHip/LoadingPartyViewController.swift b/GetHip/LoadingPartyViewController.swift
index 6918c53..70179bb 100644
--- a/GetHip/LoadingPartyViewController.swift
+++ b/GetHip/LoadingPartyViewController.swift
@@ -218,7 +218,6 @@ extension LoadingPartyViewController: PartyServiceManagerDelegate {
                 
                 
                 
-                
                 /*
                 let asset: AVURLAsset? = AVURLAsset(URL: (self.party.currentSong.valueForProperty(MPMediaItemPropertyAssetURL) as! NSURL), options: nil)
                 
diff --git a/GetHip/PartyServiceManager.swift b/GetHip/PartyServiceManager.swift
index e88f7e1..eaa681f 100644
--- a/GetHip/PartyServiceManager.swift
+++ b/GetHip/PartyServiceManager.swift
@@ -9,6 +9,7 @@
 import Foundation
 import MultipeerConnectivity
 import MediaPlayer
+import AVFoundation
 
 
 protocol PartyServiceManagerDelegate {
@@ -60,6 +61,8 @@ class PartyServiceManager: NSObject {
     //party-creator variables
     var currentSong: MPMediaItem! = nil
     var outputStreamers: Dictionary<String, TDAudioOutputStreamer> = Dictionary<String, TDAudioOutputStreamer>()
+    var isInvitable: [Bool] = []
+    var invitableCount = 0
     
     //party-guest variables
     var currentSongTitle: String!
@@ -137,6 +140,7 @@ class PartyServiceManager: NSObject {
             }
             return (instruction!, fromPeer)
         }else{
+            
             return ("not_an_instruction", fromPeer)
         }
         
diff --git a/GetHip/TestInviteFriendsController.swift b/GetHip/TestInviteFriendsController.swift
index 022ee04..9d2ec8b 100644
--- a/GetHip/TestInviteFriendsController.swift
+++ b/GetHip/TestInviteFriendsController.swift
@@ -14,8 +14,8 @@ class TestInviteFriendsController: UIViewController, UITableViewDelegate, UITabl
     var frnds: [FriendData] = []
     var requestData: [FriendData] = []
     var isFriendSelected: [Bool] = []
-    var isInvitable: [Bool] = []
-    var invitableCount = 0
+    //var isInvitable: [Bool] = []
+    //var invitableCount = 0
     var partyData: PartyServiceManager! = nil
     
     @IBOutlet weak var table: UITableView!
@@ -47,7 +47,7 @@ class TestInviteFriendsController: UIViewController, UITableViewDelegate, UITabl
             
         }
         
-        self.partyData.serviceBrowser.stopBrowsingForPeers()
+        //self.partyData.serviceBrowser.stopBrowsingForPeers()
         
         for booli in self.isFriendSelected {
             if booli == true {
@@ -73,7 +73,7 @@ class TestInviteFriendsController: UIViewController, UITableViewDelegate, UITabl
         
         for i in 0..<self.frnds.count{
             self.isFriendSelected.append(false)
-            self.isInvitable.append(false)
+            self.partyData.isInvitable.append(false)
         }
     }
     
@@ -111,8 +111,8 @@ class TestInviteFriendsController: UIViewController, UITableViewDelegate, UITabl
     
     override func viewWillAppear(animated: Bool) {
         //start browsing for peers
-        self.partyData.setBrowser()
-        self.partyData.startBrowser()
+        //self.partyData.setBrowser()
+        //self.partyData.startBrowser()
     }
     
     override func didReceiveMemoryWarning() {
@@ -132,7 +132,7 @@ class TestInviteFriendsController: UIViewController, UITableViewDelegate, UITabl
         // #warning Incomplete method implementation.
         // Return the number of rows in the section.
         
-        return self.invitableCount
+        return self.partyData.invitableCount
         //return self.frnds.count
     }
     
@@ -143,7 +143,7 @@ class TestInviteFriendsController: UIViewController, UITableViewDelegate, UITabl
         var friend: FriendData!
         
         for i in 0..<self.frnds.count {
-            if(self.isInvitable[i] == true){
+            if(self.partyData.isInvitable[i] == true){
                 friend = self.frnds[i]
             }
         }
@@ -275,8 +275,8 @@ extension TestInviteFriendsController: PartyServiceManagerDelegate {
                 if foundPeer.displayName == friend.displayName {
                     for(index, aFriend) in enumerate(self.frnds) {
                         if aFriend.displayName == friend.displayName {
-                            self.isInvitable[index] = true
-                            self.invitableCount++
+                            self.partyData.isInvitable[index] = true
+                            self.partyData.invitableCount++
                             
                             break
                         }
@@ -288,7 +288,7 @@ extension TestInviteFriendsController: PartyServiceManagerDelegate {
     }
     
     func lostPeer() {
-        self.invitableCount--
+        self.partyData.invitableCount--
         self.table.reloadData()
     }