From a6142e9082454013acfb9526be3b896907892b71 Mon Sep 17 00:00:00 2001
From: Thomas Pietrzak <thomas.pietrzak@gmail.com>
Date: Wed, 7 Mar 2012 10:44:22 +0000
Subject: [PATCH] remove dirent.h, couple of tweaks

git-svn-id: svn+ssh://thomaspietrzak.com/var/svn/rep@54 47cf9a05-e0a8-4ed5-9e9b-101a649bc004
---
 Haptic Metronome/Haptic Metronome.suo | Bin 47616 -> 48128 bytes
 include/MetronomeHaptic.hpp           |   2 +-
 src/MetronomeHaptic.cpp               |  28 +++++++++++++++++++++-----
 src/Tools.cpp                         |   8 +++++---
 src/main.cpp                          |   2 +-
 5 files changed, 30 insertions(+), 10 deletions(-)

diff --git a/Haptic Metronome/Haptic Metronome.suo b/Haptic Metronome/Haptic Metronome.suo
index 57a05efe38d0732fe8572609b0448e5dc2963944..27c6e50df569776d9549471af352448acb37eec3 100644
GIT binary patch
delta 4195
zcmd5<eNa@_6~AxyE&B)`F3Um@wd@B(R6cfBjFlK+VOf#yz=|YpWS4~+Qe+u+u@E(o
zN)u`lMNZnJnKX*ym^d|#@H#e~=~PiWotk#UPG>S>O@r3fHm#|)w2d~E{_fjF+ti86
zKW*Qe-`;c1efQjR?>*<-vjfwrfsa-D)tPG<V<kW--~`Hm+cPsW^=Qi@G-Yayf`fcT
zme`FDc>ouUElS?&-993ABziA=U~l~7CxROClMVE=cvgA>BxmV-Vm6&Li*m0<REfy~
zBm-Kbn8JyJT8}QL;zI6O^;_!>XN~1Qf1u$oO<1gQu_UHRsTiF*t081`i^f@I+E^#0
zfXSK_giM3N8}dz4oS+_o-qGr0t(yf{hz01;+Kl8N+sZmwD{BMVSqpl4X`<3X!!|Pw
zSYV!IP{M*|=126&q0Cx=PK!2qI;&2UmO*T~)3x-R(nX=10nM)<eTQ!5R7#nk7Dm2_
z`3;DN;^^tzbyS-5$avnk@NfY{+n9sdnF|}dk`>_BhUJwg^m0%(yiR5X<xu(@psaWu
zbS-~_aAgjQDxqVx0u45p&2^M<#9kUJEWk($z>iMT2x5x*?3L0IP}vc&JZ%>R?Lrk;
ze0R=fn-^3_#?n~>_P2+M3Kr=ug>D}x{qAJa(R8-|$Ma@RlSxdYjsl~6uwb8tZw(C;
zo{{Vrna0)d>DocG%6$)S6JpkZ)TPU}R(GoUe*yX;!2R-<Xg`S1m(X60&{xp@IznGX
z`&;05z=y!^fj<D(fRBJb0@r~Xz@LCW1Jl4?fWHEN13m_B0=F2O&;AbL6W|}fZD0mq
z*y8cxGb+&ln)d2*Xu70UBNRqBIaC_26^3X+e}8WrbuXi4??cqJS*P}~T~Uu2t}&22
zKQpNfAz2OI?uCzcvphB&m4=DRGFs)!wDhno7}tq-@v}l`TF-)to*?LdiKG5|#1Xy-
zF(1Yu)}Wz7iLY)*x>=tx`fgtxdVP>`3%TBV_vArW7v9y-*QHpsh9$5E_;%|tfgehG
zz*^%Ni(x+^;U(W9cOVq-I0OEkEp45lpeNYv_XM|gwzjplw*-3W#GVS_R8-%k(Bnf^
z;ipl4oA8ZT@_yAWoR8xB>$}rw@@o=(YtY^=3(i6--fa%Mt88UKnJu?uWx?`Xo6Tv>
zb(Gm0xmK&gTDr>Wa=A*E@7TV&x;^N3wRf}y*KGF}de#Tqx`Uq2T(KwQ^M?YR9qldM
zzV1GcTjA<De0^=*U?kqhIjY^AC!CJL_!E0l)(dcT6`%%0fM=H&KnqAfEbssj2gCyj
zKq4>?&;dz+9^mn7h_tt9ef@Hs1zcuCvIZ@^TJL?N2t;v2Sc0|`a7K6++O-jS9omWr
zU4^z9sG%G6?`qtEKu3@s-JJs~xbe!<UL2*vh%w9=&8Pjt-qh{kB!~&JPwoPp0LnQ>
zr=ZE#Qd9L|Bb8qxeszFzj^4->W$;UL_Tkp><vZ`X-AGfpXoiUATRGG;sgag~TXRRU
z>BZRo|A}kPdS+WU3HwS?dG!!}vQH*~;5ooKhe%d7H4st3n|^>Rb#kvS9Dk}@6f3|g
z6-ubnEmlPsdAc)RO)Bf+`(~Duh@Zh+(>#oxefSL;t1vt<2a)jnYzNKcE~fGPFVN4*
zjif7BD0_mL8sWL9GBv*+G9K3@onX(uU~THoc<KAa3*OaUz7fldFgoHg2(N!yk4DMX
za(~|sRZ=l*X$Hbe-Trg2Hp0lE9p_ZBLJio*?uZ8B)d~MzEb-~R#Sfb0mc(7VFZS;0
zz2csfRwfVfHS)sg?n46xBQ^UCTArR6dj@68W_ojDs(kTny^4<PbkkI&ffnyH;2<*S
z*@`W6IHUt@kgpv}R?+@y!+k5a@Lj3LARFzKzd0hmOjnM2X<wqAUjL3n#%HY5`sR?(
zt4w{hk8A%tX4*)_?GiOR(qS5p2yWV{k;lwr)|kaszIfc=nk;mkqMJ=i$b8%^c_H4!
zyLf5hK-XEN>ww0@t3yp0BuB%NXU%j*v|7p`IgSDRnVIq71`FXv^y5Z;Qn}So(Nc5!
z65-&dPwSpFs-vomJR1y2Z>zI1R=jd!kLK3(p0AvHr$nus`qY?#p4t#EjPTM>?Pk$c
z8m3?_)ivsp-do(dqHFZaGpEL+hL+2QYg(=oR?NDq2NrYtqpKuF-DTA0$Tsc7y7la!
z@c&ase6%9NZTZ0qV;>q{o*EMJMo>49yl5ePoxUX4;TAh-u;NL&nx?0is!fWE>^GR<
zB0O;p@tuvz9}$~yv!x_dZlvK_9aU`5%g<G1s=|kJUlkLTYc=_p@QtV^L^Q(49E^D}
z>M_GLsah*v7V}fmgIlP}l_uM3bpoBL8^JC#DXaGu>*Ho?FciM>`9lkYsA6d|U40_e
zgsUDi9D>V#Mj;vaZx)h_Eu%|E{gi<t_BO@{hoaiAaOkB9JY4<M+>=Td8()j^G)LWQ
zg*?iwX_K42jopnVr-h?ZFD$`y{Xz&P7L9Zog#sEKXwXzDiD$x6L{>4L_QvPaq{RxD
z{)4uP38ZSQ;#p4q;#=?Q=yaToLf@;66?lej!O19@>^%_s!g*_Jz2*YAa27M`%#sfr
t|9h`|_&$hZ;cWOhlLk=@InR<)AdZI>B$=f;a439~A@ODydjt%B{t1$5wS52p

delta 2365
zcmb_eZ%kWN6u<ZNmA+d36vR>)Go|em5U|uP&P~S~t^C_u3zoJE#EATvolpprM3{>;
zAlZiwg@Xn+$+m2XCX0dXWi$TUieq2q;xI9pA2cz3^21Dwvc&O0Jhy$V!}lCtyyVw=
z&bjBDd+s^s-An9GF1E^@(pdglUtg~ygt!qN#B+#xL<6D`0T!KkJ5%x@(}HM4ynyf{
z+7JOm5D`KgKrr2QHcz*}4BwYKXowbFthhlnD2sVvjK41IN0PDdZEhJPti1G^mgjh8
z2r-={MV!@j7(eS1E-m!FUqAosogag1x9`A`%^`^bZx+hXx+?7<YVpH#K_#qOd;<Dd
zFV8HLPS8o|ZmEH4#&EZ#w}OzUvBI3K41VIxkg!b%6{!2LtS?3FUaF_eg*`1=-R9#3
z8*-&-Nwnf7Dm{d(Nftr0GNxtG6S!NsHyOg?@>13wB#sxuSXGmrZb8~AFG#CZmnr-*
zv_s=0yWrO+g7k(Qp9qT%JD6)s3P}MJx=Lo8Zn(<VXj$41!KibuU_q)d<JQU3qT3W%
z9K)%J6l1{#$OzO9Z+*~>Ro+gXBs++MIB~8cN1)cV6+UnY;NS(Aa9O0d>k}<pHPk?K
z=L#(I4s946?UP1#9i~}cB+nK~YtKZuY5&{>ahc<{p(s^=I<KDWM9$14SX?RU&eqX#
zptIw^zk3uWX1|AbCau!!dv;E9lypJ<qx~>gZ<caT7%A|xAy^zQ&Z{O}WDx&Sm5D>m
zyc;}+8?j@oP&L0W-4cROt7F=4gt^w2&ie%li>I66WM2tt7;vw47@V;};#ii{_fer{
zCe+B6Wa0^}Xay&7yEBp(<9cX4<C9j-Ez%2z8hL)7yadsRpBK}5tC4IC{9I5EAGVvM
zA3nCzGqGVUyd1BGwPqs(7LMn2kT8j0=zU~_bdw(GjnQkI(2Vw6#^LMV@$557rRK;@
zPES}m*;kVi#c+?W7AoQTq+kC4nJp$Hk6eTE;DsrF0hBw6;BtcjrUGudq>#pgwe)j^
z^c(-vG@+2jgE`tgBi-Qv5L+tg6~+2gAfKy#1x^Pm=q1HsZ`cKk;JY^@{qRs%hkvNE
z>(!*gWrYno)Fn5Ry($C6kdn5_m8pQBOZt{=zf|!q=!4;K|3I`y*7-tBM{o~Bdcz0r
z=f>dc3`e33o&C(w+rBcYaForC`h1h8skNuG8+Nx;tE6`-pf|`GJwvJOaw(x4`QzNh
zh~@WAQF%zL6Q4sostfRS&}2Hux=0?wNHf-RpUR0QLt32}6Go(;Vis!UY&LaeR0$bJ
zx`3%}(l#tAH~~HX-3Q6I*#(#yRSEW7*btu08bmZ@$wq9-Lp*{|$&TDL$(@*LdgzeQ
zBRrcoiwLL63OSFW(D<1N_jZiPuKUbj8Df{N`Ud}QBSm~UvLlrvZEW|Anb4wHKHF6h
zt)eZH<+1U2GG!f={V9TtFV=)b)yszGh)3<dX)`@0AA?Qo{{c2UYCaBZNM3eI6Mx~&
z{m#t277w<WSfi%KZ&xfxFkaQ8{r`Mcq^kKXsrTofm*bX^y|WPg)XV1VTNubm1RH+?
Ddg$b*

diff --git a/include/MetronomeHaptic.hpp b/include/MetronomeHaptic.hpp
index 35bc78f..8ae11c8 100644
--- a/include/MetronomeHaptic.hpp
+++ b/include/MetronomeHaptic.hpp
@@ -30,7 +30,7 @@ class MetronomeHaptic : public Metronome
 	private:
 		static int thread_func(void *unused);
 		SDL_Thread *thread;
-		TactonPlayer _tactonPlayer;
+		TactonPlayer *_tactonPlayer;
 };
 
 #endif
diff --git a/src/MetronomeHaptic.cpp b/src/MetronomeHaptic.cpp
index 2093a6a..e942d6a 100644
--- a/src/MetronomeHaptic.cpp
+++ b/src/MetronomeHaptic.cpp
@@ -10,15 +10,30 @@ extern Uint32 start;
 extern FILE *logfile;
 
 MetronomeHaptic::MetronomeHaptic(const Track &track, Uint32 nbbeats, Uint32 tempo, bool activated)
-:Metronome(track, nbbeats, tempo, activated), thread(NULL), _tactonPlayer("COM3")
+:Metronome(track, nbbeats, tempo, activated), thread(NULL)
 {
+	try
+	{
+		_tactonPlayer = new TactonPlayer("COM4");
+	}
+	catch (...)
+	{
+		SDL_Log("Wristband not found");
+		_tactonPlayer = NULL;
+	}
+
 	//load the tactons
-	_tactonPlayer.registFile("bips.txt");
+	if (_tactonPlayer)
+		_tactonPlayer->registFile("bips.txt");
 }
 
 MetronomeHaptic::~MetronomeHaptic()
 {
-	_tactonPlayer.stop();
+	if (_tactonPlayer)
+	{
+		_tactonPlayer->stop();
+		delete _tactonPlayer;
+	}
 	_activated = false;
 	SDL_WaitThread(thread, NULL);
 }
@@ -45,10 +60,12 @@ void MetronomeHaptic::init()
 
 void MetronomeHaptic::checkAt(Uint32 timestamp)
 {
+	if (!_tactonPlayer)
+		return;
 	//send first beeps in advance
 	while (_iBips != _bips->end() && timestamp >= BIPTIMESTAMP(*_iBips))
 	{
-		_tactonPlayer.schedule(_currentbeat % 4, BIPTIMESTAMP(*_iBips));
+		_tactonPlayer->schedule(_currentbeat % 4, BIPTIMESTAMP(*_iBips));
 
 		if (logfile)
 			fprintf(logfile, "BIP;%d;%d;%d\n", BIPTICK(*_iBips), BIPTIMESTAMP(*_iBips), 0);
@@ -78,7 +95,8 @@ int MetronomeHaptic::thread_func(void *obj)
 
 //	SDL_SetThreadPriority(SDL_THREAD_PRIORITY_HIGH);
 	
-	thismetronome->_tactonPlayer.start();
+	if (thismetronome->_tactonPlayer)
+		thismetronome->_tactonPlayer->start();
 
 	while(thismetronome->_activated)
 	{
diff --git a/src/Tools.cpp b/src/Tools.cpp
index bb23adc..e735657 100644
--- a/src/Tools.cpp
+++ b/src/Tools.cpp
@@ -25,8 +25,9 @@
 #include <cmath>
 #include <cstdio>
 #include <sys/types.h>
+#include <direct.h>
 
-#include <dirent.h>
+//#include <dirent.h>
 
 using namespace std;
 
@@ -43,13 +44,14 @@ bool fileExists(const String &f)
 
 bool dirExists(const String &d)
 {
-  DIR *dir;
+  return _chdir(d.c_str()) == 0;
+/*  DIR *dir;
   if ((dir = opendir(d.c_str())) != NULL)
   {
     closedir(dir);
     return true;
   }
-  return false;
+  return false;*/
 }
 
 Vector2D<int> rotatePoint(const Vector2D<int> pos, const Vector2D<int> center, const double &angle)
diff --git a/src/main.cpp b/src/main.cpp
index 1ee3801..5357327 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -115,7 +115,7 @@ int main(int argc, char *argv[])
 		}
 		catch(...)
 		{
-			SDL_LogError(SDL_LOG_CATEGORY_ERROR, "Unable to load the song fil\n");
+			SDL_LogError(SDL_LOG_CATEGORY_ERROR, "Unable to load the song file\n");
 			exit(0);
 		}
 
-- 
2.30.2