mirror/taglib
1
0
Fork 0
mirror of https://github.com/taglib/taglib.git synced 2025-06-04 01:28:21 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/taglib/taglib

Browse Source
This commit is contained in:
Mathias Panzenböck 2011-06-26 20:58:32 +02:00
commit 57bf96d169
4 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
taglib/riff/aiff/aiffproperties.cpp
View File

@ -85,7 +85,8 @@ public:
bitrate(0),
sampleRate(0),
channels(0),
sampleWidth(0)
sampleWidth(0),
sampleFrames(0)
{
}
@ -95,6 +96,7 @@ public:
int sampleRate;
int channels;
int sampleWidth;
uint sampleFrames;
};
////////////////////////////////////////////////////////////////////////////////
@ -137,6 +139,11 @@ int RIFF::AIFF::Properties::sampleWidth() const
return d->sampleWidth;
}
uint RIFF::AIFF::Properties::sampleFrames() const
{
return d->sampleFrames;
}
////////////////////////////////////////////////////////////////////////////////
// private members
////////////////////////////////////////////////////////////////////////////////
@ -144,10 +151,10 @@ int RIFF::AIFF::Properties::sampleWidth() const
void RIFF::AIFF::Properties::read(const ByteVector &data)
{
d->channels = data.mid(0, 2).toShort();
uint sampleFrames = data.mid(2, 4).toUInt();
d->sampleFrames = data.mid(2, 4).toUInt();
d->sampleWidth = data.mid(6, 2).toShort();
double sampleRate = ConvertFromIeeeExtended(reinterpret_cast<unsigned char *>(data.mid(8, 10).data()));
d->sampleRate = sampleRate;
d->bitrate = (sampleRate * d->sampleWidth * d->channels) / 1000.0;
d->length = sampleFrames / d->sampleRate;
d->length = d->sampleFrames / d->sampleRate;
}

1
taglib/riff/aiff/aiffproperties.h
View File

@ -65,6 +65,7 @@ namespace TagLib {
virtual int channels() const;
int sampleWidth() const;
uint sampleFrames() const;
private:
Properties(const Properties &);

8
taglib/riff/wav/wavproperties.cpp
View File

@ -42,6 +42,7 @@ public:
sampleRate(0),
channels(0),
sampleWidth(0),
sampleFrames(0),
streamLength(streamLength)
{
@ -53,6 +54,7 @@ public:
int sampleRate;
int channels;
int sampleWidth;
uint sampleFrames;
uint streamLength;
};
@ -102,6 +104,11 @@ int RIFF::WAV::Properties::sampleWidth() const
return d->sampleWidth;
}
uint RIFF::WAV::Properties::sampleFrames() const
{
return d->sampleFrames;
}
////////////////////////////////////////////////////////////////////////////////
// private members
////////////////////////////////////////////////////////////////////////////////
@ -117,4 +124,5 @@ void RIFF::WAV::Properties::read(const ByteVector &data)
d->bitrate = byteRate * 8 / 1000;
d->length = byteRate > 0 ? d->streamLength / byteRate : 0;
d->sampleFrames = d->streamLength / (d->channels * (d->sampleWidth / 8));
}

1
taglib/riff/wav/wavproperties.h
View File

@ -74,6 +74,7 @@ namespace TagLib {
virtual int channels() const;
int sampleWidth() const;
uint sampleFrames() const;
private:
Properties(const Properties &);