hydrar/mistserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Improved various DTSC toPrettyString functions to be able to handle std::ostream instead of std::stringstream.

Browse source
This commit is contained in:
Thulinma 2014-04-12 08:07:19 +02:00
parent 0e5d838a20
commit dbf0b74e0a
2 changed files with 21 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
lib/dtsc.h
View file

@ -155,7 +155,7 @@ namespace DTSC {
long getOffset();
void setOffset(long newOffset);
char * getData();
void toPrettyString(std::stringstream & str, int indent = 0);
void toPrettyString(std::ostream & str, int indent = 0);
private:
///\brief Data storage for this packet.
///
@ -181,7 +181,7 @@ namespace DTSC {
long getTime();
void setTime(long newTime);
char * getData();
void toPrettyString(std::stringstream & str, int indent = 0);
void toPrettyString(std::ostream & str, int indent = 0);
private:
///\brief Data storage for this packet.
///
@ -205,7 +205,7 @@ namespace DTSC {
long getSize();
void setSize(long newSize);
char * getData();
void toPrettyString(std::stringstream & str, int indent = 0);
void toPrettyString(std::ostream & str, int indent = 0);
private:
char data[11];
};
@ -245,7 +245,7 @@ namespace DTSC {
//vorbis and theora only
std::string idHeader;
std::string commentHeader;
void toPrettyString(std::stringstream & str, int indent = 0, int verbosity = 0);
void toPrettyString(std::ostream & str, int indent = 0, int verbosity = 0);
};
class Track : public readOnlyTrack {
@ -267,7 +267,7 @@ namespace DTSC {
std::deque<Part> parts;
Key & getKey(unsigned int keyNum);
void reset();
void toPrettyString(std::stringstream & str, int indent = 0, int verbosity = 0);
void toPrettyString(std::ostream & str, int indent = 0, int verbosity = 0);
};
class readOnlyMeta {
@ -288,7 +288,7 @@ namespace DTSC {
void writeTo(char * p);
JSON::Value toJSON();
bool isFixed();
void toPrettyString(std::stringstream & str, int indent = 0, int verbosity = 0);
void toPrettyString(std::ostream & str, int indent = 0, int verbosity = 0);
};
class Meta : public readOnlyMeta {
@ -305,7 +305,7 @@ namespace DTSC {
JSON::Value toJSON();
void reset();
bool isFixed();
void toPrettyString(std::stringstream & str, int indent = 0, int verbosity = 0);
void toPrettyString(std::ostream & str, int indent = 0, int verbosity = 0);
};
/// A simple wrapper class that will open a file and allow easy reading/writing of DTSC data from/to it.

22
lib/dtscmeta.cpp
View file

@ -71,13 +71,19 @@ namespace DTSC {
/// Valid packets have a length of at least 8, known header type, and length equal to the length set in the header.
Packet::operator bool() const {
if (!data) {
DEBUG_MSG(DLVL_DONTEVEN, "No data");
return false;
}
if (dataLen < 8) {
DEBUG_MSG(DLVL_DONTEVEN, "Datalen < 8");
return false;
}
if (version == DTSC_INVALID){
DEBUG_MSG(DLVL_DONTEVEN, "No valid version");
return false;
}
if (version == DTSC_INVALID){return false;}
if (ntohl(((int *)data)[1]) + 8 != dataLen) {
DEBUG_MSG(DLVL_DONTEVEN, "Length mismatch");
return false;
}
return true;
@ -365,7 +371,7 @@ namespace DTSC {
return data;
}
void Part::toPrettyString(std::stringstream & str, int indent){
void Part::toPrettyString(std::ostream & str, int indent){
str << std::string(indent, ' ') << "Part: Size(" << getSize() << "), Dur(" << getDuration() << "), Offset(" << getOffset() << ")" << std::endl;
}
@ -419,7 +425,7 @@ namespace DTSC {
return data;
}
void Key::toPrettyString(std::stringstream & str, int indent){
void Key::toPrettyString(std::ostream & str, int indent){
str << std::string(indent, ' ') << "Key " << getNumber() << ": Pos(" << getBpos() << "), Dur(" << getLength() << "), Parts(" << getParts() << "), Time(" << getTime() << ")" << std::endl;
}
@ -459,7 +465,7 @@ namespace DTSC {
return data;
}
void Fragment::toPrettyString(std::stringstream & str, int indent){
void Fragment::toPrettyString(std::ostream & str, int indent){
str << std::string(indent, ' ') << "Fragment " << getNumber() << ": Dur(" << getDuration() << "), Len(" << (int)getLength() << "), Size(" << getSize() << ")" << std::endl;
}
@ -799,7 +805,7 @@ namespace DTSC {
}
}
void readOnlyTrack::toPrettyString(std::stringstream & str, int indent, int verbosity){
void readOnlyTrack::toPrettyString(std::ostream & str, int indent, int verbosity){
str << std::string(indent, ' ') << "Track " << getWritableIdentifier() << std::endl;
str << std::string(indent + 2, ' ') << "ID: " << trackID << std::endl;
str << std::string(indent + 2, ' ') << "Firstms: " << firstms << std::endl;
@ -899,7 +905,7 @@ namespace DTSC {
}
}
void Track::toPrettyString(std::stringstream & str, int indent, int verbosity){
void Track::toPrettyString(std::ostream & str, int indent, int verbosity){
str << std::string(indent, ' ') << "Track " << getWritableIdentifier() << std::endl;
str << std::string(indent + 2, ' ') << "ID: " << trackID << std::endl;
str << std::string(indent + 2, ' ') << "Firstms: " << firstms << std::endl;
@ -1515,7 +1521,7 @@ namespace DTSC {
return result;
}
void readOnlyMeta::toPrettyString(std::stringstream & str, int indent, int verbosity){
void readOnlyMeta::toPrettyString(std::ostream & str, int indent, int verbosity){
for (std::map<int, readOnlyTrack>::iterator it = tracks.begin(); it != tracks.end(); it++) {
it->second.toPrettyString(str, indent, verbosity);
}
@ -1534,7 +1540,7 @@ namespace DTSC {
str << std::string(indent, ' ') << "More Header: " << moreheader << std::endl;
}
void Meta::toPrettyString(std::stringstream & str, int indent, int verbosity){
void Meta::toPrettyString(std::ostream & str, int indent, int verbosity){
for (std::map<int, Track>::iterator it = tracks.begin(); it != tracks.end(); it++) {
it->second.toPrettyString(str, indent, verbosity);
}