Fix conflicts with default

--HG--
branch : sounddata-samplecount

src/modules/sound/SoundData.cpp

@@ -152,9 +152,9 @@ int SoundData::getSampleCount() const
 	return (size/channels)/(bits/8);
 }
 
-int SoundData::getDuration() const
+float SoundData::getDuration() const
 {
-	return size/(channels*sampleRate*bits/8);
+	return float(size) /(channels*sampleRate*bits/8);
 }
 
 void SoundData::setSample(int i, float sample)

src/modules/sound/SoundData.h

@@ -50,7 +50,7 @@ public:
 	virtual int getSampleRate() const;
 	virtual int getSampleCount() const;
 
-	virtual int getDuration() const;
+	virtual float getDuration() const;
 
 	void setSample(int i, float sample);
 	float getSample(int i) const;

src/modules/sound/wrap_SoundData.cpp

@@ -63,7 +63,7 @@ int w_SoundData_getSampleCount(lua_State *L)
 int w_SoundData_getDuration(lua_State *L)
 {
 	SoundData *t = luax_checksounddata(L, 1);
-	lua_pushinteger(L, t->getDuration());
+	lua_pushnumber(L, t->getDuration());
 	return 1;
 }