mirror of
https://github.com/badaix/snapcast.git
synced 2025-06-01 18:31:45 +02:00
ogg rate, 32bit rate
git-svn-id: svn://elaine/murooma/trunk@288 d8a302eb-03bc-478d-80e4-98257eca68ef
This commit is contained in:
parent
983ded3d29
commit
831f07a657
4 changed files with 14 additions and 23 deletions
|
@ -10,12 +10,12 @@ class SampleFormat : public BaseMessage
|
|||
public:
|
||||
SampleFormat();
|
||||
SampleFormat(const std::string& format);
|
||||
SampleFormat(uint16_t rate, uint16_t bits, uint16_t channels);
|
||||
SampleFormat(uint32_t rate, uint16_t bits, uint16_t channels);
|
||||
|
||||
void setFormat(const std::string& format);
|
||||
void setFormat(uint16_t rate, uint16_t bits, uint16_t channels);
|
||||
void setFormat(uint32_t rate, uint16_t bits, uint16_t channels);
|
||||
|
||||
uint16_t rate;
|
||||
uint32_t rate;
|
||||
uint16_t bits;
|
||||
uint16_t channels;
|
||||
|
||||
|
@ -29,7 +29,7 @@ public:
|
|||
|
||||
virtual void read(std::istream& stream)
|
||||
{
|
||||
stream.read(reinterpret_cast<char *>(&rate), sizeof(uint16_t));
|
||||
stream.read(reinterpret_cast<char *>(&rate), sizeof(uint32_t));
|
||||
stream.read(reinterpret_cast<char *>(&bits), sizeof(uint16_t));
|
||||
stream.read(reinterpret_cast<char *>(&channels), sizeof(uint16_t));
|
||||
stream.read(reinterpret_cast<char *>(&sampleSize), sizeof(uint16_t));
|
||||
|
@ -38,26 +38,19 @@ public:
|
|||
|
||||
virtual uint32_t getSize()
|
||||
{
|
||||
return 5*sizeof(int16_t);
|
||||
return sizeof(int32_t) + 4*sizeof(int16_t);
|
||||
}
|
||||
|
||||
protected:
|
||||
virtual void doserialize(std::ostream& stream)
|
||||
{
|
||||
stream.write(reinterpret_cast<char *>(&rate), sizeof(uint16_t));
|
||||
stream.write(reinterpret_cast<char *>(&rate), sizeof(uint32_t));
|
||||
stream.write(reinterpret_cast<char *>(&bits), sizeof(uint16_t));
|
||||
stream.write(reinterpret_cast<char *>(&channels), sizeof(uint16_t));
|
||||
stream.write(reinterpret_cast<char *>(&sampleSize), sizeof(uint16_t));
|
||||
stream.write(reinterpret_cast<char *>(&frameSize), sizeof(uint16_t));
|
||||
}
|
||||
|
||||
/*private:
|
||||
uint16_t rate_;
|
||||
uint16_t bits_;
|
||||
uint16_t channels_;
|
||||
uint16_t bytes_;
|
||||
uint16_t frameSize_;
|
||||
*/
|
||||
};
|
||||
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue