Replaced ofxAvailability by ofxReachability.

CLOUDS-Interactive-Documentary · Jul 2, 2015 · 43cafc0 · 43cafc0
1 parent a90451b
commit 43cafc0
Show file tree

Hide file tree

Showing 5 changed files with 58 additions and 32 deletions.
diff --git a/CLOUDS/CLOUDS.vcxproj b/CLOUDS/CLOUDS.vcxproj
diff --git a/CLOUDS/CLOUDS.vcxproj.filters b/CLOUDS/CLOUDS.vcxproj.filters
@@ -1174,15 +1174,24 @@
     <ClCompile Include="..\..\..\addons\ofxCrypto\src\ofxCrypto.cpp">
       <Filter>addons\ofxCrypto\src</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\addons\ofxAvailability\src\ofxAvailability.cpp">
-      <Filter>addons\ofxAvailability\src</Filter>
-    </ClCompile>
     <ClCompile Include="..\CloudsLibrary\src\StoryEngine\CloudsMedia.cpp">
       <Filter>CloudsLibrary\src\StoryEngine</Filter>
     </ClCompile>
     <ClCompile Include="..\CloudsLibrary\src\RGBD\HUD\CloudsHUDScroller.cpp">
       <Filter>CloudsLibrary\src\RGBD\HUD</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\..\addons\ofxReachability\src\ofxReachability.cpp">
+      <Filter>addons\ofxReachability\src</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\addons\ofxReachability\src\ofxReachabilityImpl.cpp">
+      <Filter>addons\ofxReachability\src</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\addons\ofxReachability\src\ofxReachabilityImplPing.cpp">
+      <Filter>addons\ofxReachability\src</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\addons\ofxReachability\src\win32\ofxReachabilityImplWin.cpp">
+      <Filter>addons\ofxReachability\src\win32</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <Filter Include="src">
@@ -1446,24 +1455,27 @@
     <Filter Include="addons\ofxJSON\libs\jsoncpp\src">
       <UniqueIdentifier>{f03ed117-8256-4898-9b03-5a5d9bae09f1}</UniqueIdentifier>
     </Filter>
-    <Filter Include="addons\ofxAvailability">
-      <UniqueIdentifier>{7a096123-bb3a-4079-9650-80f4ce75023d}</UniqueIdentifier>
-    </Filter>
     <Filter Include="addons\ofxCrypto">
       <UniqueIdentifier>{66c23771-ac84-4160-953d-06a7a972a3a2}</UniqueIdentifier>
     </Filter>
     <Filter Include="addons\ofxCrypto\src">
       <UniqueIdentifier>{a6240303-d948-4338-928e-745eb362fc78}</UniqueIdentifier>
     </Filter>
-    <Filter Include="addons\ofxAvailability\src">
-      <UniqueIdentifier>{65cbf341-3c71-4ffc-8de6-aa80a9a8dd4c}</UniqueIdentifier>
-    </Filter>
     <Filter Include="addons\ofxAudioDecoder">
       <UniqueIdentifier>{5040d026-8402-4bb0-829a-74666a5227cc}</UniqueIdentifier>
     </Filter>
     <Filter Include="addons\ofxAudioDecoder\couples">
       <UniqueIdentifier>{9190189d-e255-468f-a179-156c2aab447b}</UniqueIdentifier>
     </Filter>
+    <Filter Include="addons\ofxReachability">
+      <UniqueIdentifier>{57823a60-4f03-4a38-a535-55dd84e3d37c}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="addons\ofxReachability\src">
+      <UniqueIdentifier>{51460747-ac4e-4cf0-aa82-242abaf1c477}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="addons\ofxReachability\src\win32">
+      <UniqueIdentifier>{87b01735-bcad-40ee-ac3b-1f13ff21aebe}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="src\testApp.h">
@@ -3117,9 +3129,6 @@
     <ClInclude Include="..\..\..\addons\ofxCrypto\src\ofxCrypto.h">
       <Filter>addons\ofxCrypto\src</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\addons\ofxAvailability\src\ofxAvailability.h">
-      <Filter>addons\ofxAvailability\src</Filter>
-    </ClInclude>
     <ClInclude Include="..\CloudsLibrary\src\CloudsCrypto.h">
       <Filter>CloudsLibrary\src</Filter>
     </ClInclude>
@@ -3132,6 +3141,18 @@
     <ClInclude Include="..\..\..\addons\ofxAudioDecoder\couples\ofxAudioDecoderTonic.h">
       <Filter>addons\ofxAudioDecoder\couples</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\..\addons\ofxReachability\src\ofxReachability.h">
+      <Filter>addons\ofxReachability\src</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\addons\ofxReachability\src\ofxReachabilityImpl.h">
+      <Filter>addons\ofxReachability\src</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\addons\ofxReachability\src\ofxReachabilityImplPing.h">
+      <Filter>addons\ofxReachability\src</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\addons\ofxReachability\src\win32\ofxReachabilityImplWin.h">
+      <Filter>addons\ofxReachability\src\win32</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\..\addons\ofxAssimpModelLoader\libs\assimp\include\aiColor4D.inl">

diff --git a/CloudsLibrary/src/Core/CloudsPlaybackController.cpp b/CloudsLibrary/src/Core/CloudsPlaybackController.cpp
@@ -210,8 +210,8 @@ void CloudsPlaybackController::exit(ofEventArgs & args){
         ofRemoveListener(ofURLResponseEvent(), this, &CloudsPlaybackController::updateCheckCompleted);
 
 #ifdef VHX_MEDIA
-        ofRemoveListener(ofxAvailability::connectedEvent, this, &CloudsPlaybackController::networkConnected);
-        ofRemoveListener(ofxAvailability::disconnectedEvent, this, &CloudsPlaybackController::networkDisconnected);
+        ofRemoveListener(ofxReachability::connectedEvent, this, &CloudsPlaybackController::networkConnected);
+        ofRemoveListener(ofxReachability::disconnectedEvent, this, &CloudsPlaybackController::networkDisconnected);
 
         ofRemoveListener(vhxAuth.requestTokenComplete, this, &CloudsPlaybackController::requestTokenComplete);
         ofRemoveListener(vhxAuth.refreshTokenComplete, this, &CloudsPlaybackController::refreshTokenComplete);
@@ -225,7 +225,7 @@ void CloudsPlaybackController::exit(ofEventArgs & args){
 	}
 
 #ifdef VHX_MEDIA
-    availability.exit();
+    reachability.exit();
 #endif
 }
 
@@ -259,8 +259,8 @@ void CloudsPlaybackController::setup(){
 
         ofAddListener(ofURLResponseEvent(), this, &CloudsPlaybackController::updateCheckCompleted);
         #ifdef VHX_MEDIA
-        ofAddListener(ofxAvailability::connectedEvent, this, &CloudsPlaybackController::networkConnected);
-        ofAddListener(ofxAvailability::disconnectedEvent, this, &CloudsPlaybackController::networkDisconnected);
+        ofAddListener(ofxReachability::connectedEvent, this, &CloudsPlaybackController::networkConnected);
+        ofAddListener(ofxReachability::disconnectedEvent, this, &CloudsPlaybackController::networkDisconnected);
 
         ofAddListener(vhxAuth.requestTokenComplete, this, &CloudsPlaybackController::requestTokenComplete);
         ofAddListener(vhxAuth.refreshTokenComplete, this, &CloudsPlaybackController::refreshTokenComplete);
@@ -321,8 +321,7 @@ void CloudsPlaybackController::setup(){
 //#endif
 
 #ifdef VHX_MEDIA
-    //availability.setPingAddress("www.vhx.tv");
-    availability.setup();
+    reachability.setup();
 #endif
 
 	cout << "*****LOAD STEP*** SHOWING INTRO" << endl;

diff --git a/CloudsLibrary/src/Core/CloudsPlaybackController.h b/CloudsLibrary/src/Core/CloudsPlaybackController.h
@@ -25,7 +25,7 @@
 #include "CloudsPortal.h"
 
 #ifdef VHX_MEDIA
-#include "ofxAvailability.h"
+#include "ofxReachability.h"
 #include "CloudsVHXAuth.h"
 #endif
 
@@ -120,7 +120,7 @@ class CloudsPlaybackController : public ofThread {
     CloudsMixer mixer;
 
     #ifdef VHX_MEDIA
-    ofxAvailability availability;
+    ofxReachability reachability;
     CloudsVHXAuth vhxAuth;
     #endif
 

diff --git a/cloneaddons.sh b/cloneaddons.sh
@@ -20,7 +20,6 @@ ${NEWPREFIX}ofxAudioDecoder
 ${NEWPREFIX}ofxAudioFeatures
 ${NEWPREFIX}ofxAudioUnit
 ${NEWPREFIX}ofxAutoReloadedShader
-${NEWPREFIX}ofxAvailability
 ${NEWPREFIX}ofxAVFVideoPlayer
 ${NEWPREFIX}ofxBillboard
 ${NEWPREFIX}ofxBinaryMesh
@@ -65,6 +64,7 @@ cd ..
 
 ${NEWPREFIX}ofxPtf
 ${NEWPREFIX}ofxRange
+${NEWPREFIX}ofxReachability
 ${NEWPREFIX}ofxRegex
 
 ${NEWPREFIX}ofxRGBDepth