* http://www.mozilla.org/MPL/ *
***************************************************************************/
-#include <bitset>
-
#include <tstring.h>
#include <tdebug.h>
#include <tpropertymap.h>
// public members
////////////////////////////////////////////////////////////////////////////////
-Speex::File::File(FileName file, bool readProperties,
- Properties::ReadStyle propertiesStyle) : Ogg::File(file)
+Speex::File::File(FileName file, bool readProperties, Properties::ReadStyle) :
+ Ogg::File(file),
+ d(new FilePrivate())
{
- d = new FilePrivate;
if(isOpen())
- read(readProperties, propertiesStyle);
+ read(readProperties);
}
-Speex::File::File(IOStream *stream, bool readProperties,
- Properties::ReadStyle propertiesStyle) : Ogg::File(stream)
+Speex::File::File(IOStream *stream, bool readProperties, Properties::ReadStyle) :
+ Ogg::File(stream),
+ d(new FilePrivate())
{
- d = new FilePrivate;
if(isOpen())
- read(readProperties, propertiesStyle);
+ read(readProperties);
}
Speex::File::~File()
// private members
////////////////////////////////////////////////////////////////////////////////
-void Speex::File::read(bool readProperties, Properties::ReadStyle propertiesStyle)
+void Speex::File::read(bool readProperties)
{
ByteVector speexHeaderData = packet(0);
d->comment = new Ogg::XiphComment(commentHeaderData);
if(readProperties)
- d->properties = new Properties(this, propertiesStyle);
+ d->properties = new Properties(this);
}