Skip to content

Commit

Permalink
Rename bitRateStr -> bitrateStr
Browse files Browse the repository at this point in the history
  • Loading branch information
zaps166 committed Jun 14, 2023
1 parent d6e8d30 commit 1d33e37
Showing 1 changed file with 10 additions and 10 deletions.
20 changes: 10 additions & 10 deletions src/gui/DemuxerThr.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -924,7 +924,7 @@ void DemuxerThr::emitInfo()
bool once = false;
for (const ProgramInfo &program : demuxer->getPrograms())
{
const QString bitRateStr = Functions::getBitrateStr(program.bitrate);
const QString bitrateStr = Functions::getBitrateStr(program.bitrate);

if (!once)
{
Expand Down Expand Up @@ -961,7 +961,7 @@ void DemuxerThr::emitInfo()
if (!streams.isEmpty())
info += "</a>";
if (program.bitrate > 0)
info += " (" + bitRateStr + ")";
info += " (" + bitrateStr + ")";
info += "</li></ul>";

addStreamsMenuString(programsMenu, programNumberStr, streams, isCurrent, QString());
Expand Down Expand Up @@ -1016,7 +1016,7 @@ void DemuxerThr::emitInfo()
const QString streamLink = "video" + QString::number(i);
const QString streamCountStr = QString::number(++videoStreamCount);
const QString sizeStr = QString::number(streamInfo->params->width) + "x" + QString::number(streamInfo->params->height);
const QString bitRateStr = Functions::getBitrateStr(streamInfo->params->bit_rate);
const QString bitrateStr = Functions::getBitrateStr(streamInfo->params->bit_rate);
const bool currentPlaying = getCurrentPlaying(playC.videoStream, streamsInfo, streamInfo);
videoStreams += "<ul style='margin-top: 0px; margin-bottom: 0px;'><li>";
if (currentPlaying)
Expand All @@ -1041,23 +1041,23 @@ void DemuxerThr::emitInfo()
const double FPS = streamInfo->getFPS();
if (FPS)
videoStreams += "<li><b>" + tr("FPS") + ":</b> " + QString::number(FPS) + "</li>";
if (!bitRateStr.isEmpty())
videoStreams += "<li><b>" + tr("bitrate") + ":</b> " + bitRateStr + "</li>";
if (!bitrateStr.isEmpty())
videoStreams += "<li><b>" + tr("bitrate") + ":</b> " + bitrateStr + "</li>";
const auto formatName = streamInfo->getFormatName();
if (!formatName.isEmpty())
videoStreams += "<li><b>" + tr("format") + ":</b> " + formatName + "</li>";
printOtherInfo(streamInfo->other_info, videoStreams);
videoStreams += "</ul></ul>";

QString streamMenuText = " - " + sizeStr;
appendCodecBitRate(streamMenuText, streamInfo->codec_name, bitRateStr);
appendCodecBitRate(streamMenuText, streamInfo->codec_name, bitrateStr);
addStreamsMenuString(videoStreamsMenu, streamCountStr, streamLink, currentPlaying, streamMenuText);
} break;
case AVMEDIA_TYPE_AUDIO:
{
const QString streamLink = "audio" + QString::number(i);
const QString streamCountStr = QString::number(++audioStreamCount);
const QString bitRateStr = Functions::getBitrateStr(streamInfo->params->bit_rate);
const QString bitrateStr = Functions::getBitrateStr(streamInfo->params->bit_rate);
QString lang;
const bool currentPlaying = getCurrentPlaying(playC.audioStream, streamsInfo, streamInfo);
audioStreams += "<ul style='margin-top: 0px; margin-bottom: 0px;'><li>";
Expand Down Expand Up @@ -1091,8 +1091,8 @@ void DemuxerThr::emitInfo()
channels = QString::number(streamInfo->params->channels);
audioStreams += "<li><b>" + tr("channels") + ":</b> " + channels + "</li>";

if (!bitRateStr.isEmpty())
audioStreams += "<li><b>" + tr("bitrate") + ":</b> " + bitRateStr + "</li>";
if (!bitrateStr.isEmpty())
audioStreams += "<li><b>" + tr("bitrate") + ":</b> " + bitrateStr + "</li>";
const auto formatName = streamInfo->getFormatName();
if (!formatName.isEmpty())
audioStreams += "<li><b>" + tr("format") + ":</b> " + formatName + "</li>";
Expand All @@ -1102,7 +1102,7 @@ void DemuxerThr::emitInfo()
QString streamMenuText;
if (!lang.isEmpty())
streamMenuText.push_back(" - " + lang);
appendCodecBitRate(streamMenuText, streamInfo->codec_name, bitRateStr);
appendCodecBitRate(streamMenuText, streamInfo->codec_name, bitrateStr);
addStreamsMenuString(audioStreamsMenu, streamCountStr, streamLink, currentPlaying, streamMenuText);
} break;
case AVMEDIA_TYPE_SUBTITLE:
Expand Down

0 comments on commit 1d33e37

Please sign in to comment.