Martchus
/
tageditor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

show extension channel config

This commit is contained in:
Martchus 2015-09-24 01:15:48 +02:00
parent 8582da37ca
commit ffa0d45397
2 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
cli/mainfeatures.cpp
View File

@ -421,7 +421,7 @@ void printProperty(const char *propName, const char *value, const char *suffix =
cout << ' ';
}
cout << propName;
for(intention = strlen(propName); intention < 20; ++intention) {
for(intention = strlen(propName); intention < 30; ++intention) {
cout << ' ';
}
cout << value;
@ -471,7 +471,11 @@ void displayFileInfo(const StringVector &, const Argument &filesArg, const Argum
printProperty("ID", track->id(), nullptr, true);
printProperty("Name", track->name());
printProperty("Type", track->mediaTypeName());
printProperty("Format", track->formatName());
const char *fmtName = track->formatName(), *fmtAbbr = track->formatAbbreviation();
printProperty("Format", fmtName);
if(strcmp(fmtName, fmtAbbr)) {
printProperty("Abbreviation", fmtAbbr);
}
printProperty("Extensions", track->format().extensionName());
printProperty("Raw format ID", track->formatId());
if(track->size()) {
@ -486,9 +490,12 @@ void displayFileInfo(const StringVector &, const Argument &filesArg, const Argum
} else {
printProperty("Channel count", track->channelCount());
}
if(track->extensionChannelConfigString()) {
printProperty("Extension channel config", track->extensionChannelConfigString());
}
printProperty("Bitrate", track->bitrate(), "kbit/s");
printProperty("Bits per sample", track->bitsPerSample());
printProperty("Sampling frequency", track->samplingFrequency());
printProperty("Sampling frequency", track->samplingFrequency(), "Hz");
printProperty("Extension sampling frequency", track->extensionSamplingFrequency(), "Hz");
printProperty("Sample count", track->sampleCount());
cout << endl;

6
misc/htmlinfo.cpp
View File

@ -241,7 +241,11 @@ void mkTrack(QByteArray &res, const AbstractTrack *track, unsigned int trackNumb
res.append(mkRow(QCoreApplication::translate("HtmlInfo", "Resolution"), qstr(track->resolution().toString())));
}
if(track->channelConfigString()) {
res.append(mkRow(QCoreApplication::translate("HtmlInfo", "Channel config"), QCoreApplication::translate("HtmlInfo", "Channel configuration"), QString::fromLocal8Bit(track->channelConfigString())));
if(track->extensionChannelConfigString()) {
res.append(mkRow(QCoreApplication::translate("HtmlInfo", "Channel config"), QCoreApplication::translate("HtmlInfo", "Channel configuration"), QStringLiteral("%1 / %2").arg(QString::fromLocal8Bit(track->extensionChannelConfigString()), QString::fromLocal8Bit(track->channelConfigString()))));
} else {
res.append(mkRow(QCoreApplication::translate("HtmlInfo", "Channel config"), QCoreApplication::translate("HtmlInfo", "Channel configuration"), QString::fromLocal8Bit(track->channelConfigString())));
}
} else if(track->channelCount()) {
res.append(mkRow(QCoreApplication::translate("HtmlInfo", "Channel count"), QString::number(track->channelCount())));
}