From 3d4c02dcc9848f8992d23883b89d0c1ca76cafd2 Mon Sep 17 00:00:00 2001
From: Thomas Pietrzak <thomas.pietrzak@gmail.com>
Date: Wed, 15 Jun 2011 21:20:07 +0000
Subject: [PATCH] add copy constructor, and setters

git-svn-id: svn+ssh://thomaspietrzak.com/var/svn/rep@35 47cf9a05-e0a8-4ed5-9e9b-101a649bc004
---
 TactonLibrary.suo       | Bin 16896 -> 16896 bytes
 TactonPlayer/Tacton.cpp |  70 ++++++++++++++++++++++++++++++++++++++++
 TactonPlayer/Tacton.hpp |  18 +++++++++++
 3 files changed, 88 insertions(+)

diff --git a/TactonLibrary.suo b/TactonLibrary.suo
index 4b9a884fa5176df2e58ec1ddd9e2d04b7a8f7b93..56817b7501a4b43fffefc50d462c1de5a6857055 100644
GIT binary patch
delta 559
zcmYk2PiPZC6o>ORvru)Dn8dVYlXSJFR!D7A{}gKy*eZx%ldKRtcxVn@YO&y95h*#u
z8a#-I*&hf6#e!Hos08QWb+Ljd1ub~=SOo8Ts2-ZWQiOTKz~lR7e$2d9n_6w^-WJi-
zFMk@V`3(w(xJIxfz8M4DnY?>k*c3VVaUt*NS9Pq5Nf{jcAq<`M5#@*sVvc5{nZy+e
zH&KhwUQA4-L89K5RDg7oKdH}92;5XH5<0{rp->s59D&cG0N4B;A;BuEXt-&<)X&6H
zs0`AxL}|=qU*Yc1b!=rldJh_VARX&XSS!TvZ}=<LWBjq>%`iP@wW7~+fWYEthn8{Q
zy5!|EIBE~`h)nt7q@{UdYpCbnlD9AG;isXS*fbW=oj5E{oJx@N$J@H0aY|HuihH(A
zw1&UuMuo>5xv3mM&P;tI?|dg&V)Vai`wjdvHhKjI&kA`oru)&jVCX4!S^02!iSVgd
zLN#OJ$@pn(j4WWGScP3$j!&*^R~~l<hvq6bD%ICcGl`ewW0(*I+om}my2C5zk$vFZ
kR{T+U?#jTgTZ4P!>|D#>cPT3UvajKTbs0Owi)h)~yY5QDW&i*H

delta 550
zcmZo@VQgq&+>pb<cVJJP?@_HYjLZxS3=Jxit5{C)$OD;DK>QyFCSPPxnS4NyWpf3q
zH!CkAA5d5XNow;Kt_v)ak0=>z{=y%?#KQ`d5=4@oTq5Mp3pR%zS@erg$mDxAN|Oy(
zxHgvvUt#2sMwTrR_2*>-*)4=5y7`M}01FQ{P(&C>baIK*d0qw<polDrs5H<7F`x(&
zlIZ3y(msrgQj;BJ7f*IktC-BEDaI%|`Jrqi<GRU(>dl)2<X12=t>BydOX=j~!z_lI
zzbMx*PZrYXn_Qs2XtRc<3=`v|$qO~&Co32m0mDjsa=i88$z3`;lU=lzZPwGB#5nnY
zX4vE~YopBv^jcVX#DO;RAlqJI(!$8NY4T4~b(Vjia8)r=*%-2habg0`B#Vi{W<aGd
z;0I(dGB8X&VC*pYzd^v{X$IPp<1NJm*<cEQG#3!_Zf>)zVx0U*E^cz3j?82x8@tH?
zT0)Zr<kcoS$nZ_xBP%ock%QVK+Zyp?h5{hec~iebxt*O|qPjV~>(`4}9Fs5G=rZ<9
fcC@JkYT%jtNndC3GaJ6m2W$^8EplX><k$cJM;*dh

diff --git a/TactonPlayer/Tacton.cpp b/TactonPlayer/Tacton.cpp
index 3e38661..bf72612 100644
--- a/TactonPlayer/Tacton.cpp
+++ b/TactonPlayer/Tacton.cpp
@@ -78,6 +78,15 @@ Tacton::Tacton(unsigned char pattern, unsigned int duration, unsigned int freque
 	_amplitudes[0] = amplitude;
 }
 
+Tacton::Tacton(const Tacton &t)
+:_nbframes(t._nbframes), _patterns(new unsigned char[t._nbframes]), _durations(new unsigned int[t._nbframes]), _frequencies(new unsigned int[t._nbframes]), _amplitudes(new unsigned char[t._nbframes])
+{
+	memcpy(_patterns, t._patterns, t._nbframes * sizeof(unsigned char));
+	memcpy(_durations, t._durations, t._nbframes * sizeof(unsigned int));
+	memcpy(_frequencies, t._frequencies, t._nbframes * sizeof(unsigned int));
+	memcpy(_amplitudes, t._amplitudes, t._nbframes * sizeof(unsigned char));
+}
+
 Tacton::~Tacton()
 {
 	delete []_patterns;
@@ -91,6 +100,67 @@ const unsigned int Tacton::getNbFrames() const
 	return _nbframes;
 }
 
+__declspec(dllexport) void Tacton::setPattern(char pattern)
+{
+	setPattern(0, pattern);
+}
+
+__declspec(dllexport) void Tacton::setPattern(unsigned int frame, char pattern)
+{
+	if (frame < _nbframes)
+		_patterns[frame] = pattern;
+}
+
+__declspec(dllexport) void Tacton::setPattern(char *pattern)
+{
+	setPattern(0, pattern);
+}
+
+__declspec(dllexport) void Tacton::setPattern(unsigned int frame, char *pattern)
+{
+	if (frame < _nbframes)
+	{
+		unsigned char t1 = pattern[0] == '1';
+		unsigned char t2 = pattern[1] == '1';
+		unsigned char t3 = pattern[2] == '1';
+		unsigned char t4 = pattern[3] == '1';
+		_patterns[frame] = (t1 << 3) | (t2 << 2) | (t3 << 1) | t4;
+	}
+}
+
+__declspec(dllexport) void Tacton::setDuration(unsigned int duration)
+{
+	setDuration(0, duration);
+}
+
+__declspec(dllexport) void Tacton::setDuration(unsigned int frame, unsigned int duration)
+{
+	if (frame < _nbframes)
+		_durations[frame] = duration;
+}
+
+__declspec(dllexport) void Tacton::setFrequency(unsigned int frequency)
+{
+	setFrequency(0, frequency);
+}
+
+__declspec(dllexport) void Tacton::setFrequency(unsigned int frame, unsigned int frequency)
+{
+	if (frame < _nbframes)
+		_frequencies[frame] = frequency;
+}
+
+__declspec(dllexport) void Tacton::setAmplitude(unsigned int amplitude)
+{
+	setAmplitude(0, amplitude);
+}
+
+__declspec(dllexport) void Tacton::setAmplitude(unsigned int frame, unsigned int amplitude)
+{
+	if (frame < _nbframes)
+		_amplitudes[frame] = amplitude;
+}
+
 void *Tacton::rawCode() const
 {
 	unsigned char *res = new unsigned char[_nbframes * 6];
diff --git a/TactonPlayer/Tacton.hpp b/TactonPlayer/Tacton.hpp
index b5162c4..3294764 100644
--- a/TactonPlayer/Tacton.hpp
+++ b/TactonPlayer/Tacton.hpp
@@ -21,7 +21,25 @@ class Tacton
 		__declspec(dllexport) Tacton(unsigned int nbframes, unsigned char *patterns, unsigned int *durations, unsigned int *frequencies, unsigned char *amplitudes);
 		//create a simple vibration
 		__declspec(dllexport) Tacton(unsigned char pattern, unsigned int duration, unsigned int frequency, unsigned char amplitude);
+		__declspec(dllexport) Tacton(const Tacton &t);
 		__declspec(dllexport) ~Tacton();
+
+		//changes the pattern using raw format
+		__declspec(dllexport) void setPattern(char pattern);
+		__declspec(dllexport) void setPattern(unsigned int frame, char pattern);
+		//changes the pattern using string format
+		__declspec(dllexport) void setPattern(char *pattern);
+		__declspec(dllexport) void setPattern(unsigned int frame, char *pattern);
+		//changes the duration
+		__declspec(dllexport) void setDuration(unsigned int duration);
+		__declspec(dllexport) void setDuration(unsigned int frame, unsigned int duration);
+		//changes the frequency
+		__declspec(dllexport) void setFrequency(unsigned int frequency);
+		__declspec(dllexport) void setFrequency(unsigned int frame, unsigned int frequency);
+		//changes the amplitude
+		__declspec(dllexport) void setAmplitude(unsigned int amplitude);
+		__declspec(dllexport) void setAmplitude(unsigned int frame, unsigned int amplitude);
+
 		
 		//returns the number of frames
 		__declspec(dllexport) const unsigned int getNbFrames() const;
-- 
2.30.2