Permalink
Browse files

Remove unused arguments from TV::UpdateOSDStatus().

The default-valued "next" and "prev" arguments are never deliberately
set, and were actually getting in the way of the "timeout" argument.
  • Loading branch information...
1 parent 0089f7d commit 0a4eb5fa5905504250b07433c7f3568da35ed14a @stichnot stichnot committed May 17, 2012
Showing with 3 additions and 5 deletions.
  1. +2 −4 mythtv/libs/libmythtv/tv_play.cpp
  2. +1 −1 mythtv/libs/libmythtv/tv_play.h
@@ -7519,13 +7519,11 @@ void TV::UpdateOSDStatus(const PlayerContext *ctx, osdInfo &info,
void TV::UpdateOSDStatus(const PlayerContext *ctx, QString title, QString desc,
QString value, int type, QString units,
- int position, int prev, int next, OSDTimeout timeout)
+ int position, OSDTimeout timeout)
{
osdInfo info;
info.values.insert("position", position);
info.values.insert("relposition", position);
- info.values.insert("previous", prev);
- info.values.insert("next", next);
info.text.insert("title", title);
info.text.insert("description", desc);
info.text.insert("value", value);
@@ -8424,7 +8422,7 @@ void TV::ChangeSubtitleZoom(PlayerContext *ctx, int dir)
UpdateOSDStatus(ctx, tr("Adjust Subtitle Zoom"), tr("Subtitle Zoom"),
QString::number(newval),
kOSDFunctionalType_SubtitleZoomAdjust,
- "%", newval * 1000 / 200, 0, 0, kOSDTimeout_Long);
+ "%", newval * 1000 / 200, kOSDTimeout_Long);
SetUpdateOSDPosition(false);
gCoreContext->SaveSetting("OSDCC708TextZoom", newval);
}
@@ -464,7 +464,7 @@ class MTV_PUBLIC TV : public QObject
void UpdateOSDProgInfo(const PlayerContext*, const char *whichInfo);
void UpdateOSDStatus(const PlayerContext *ctx, QString title, QString desc,
QString value, int type, QString units,
- int position = 0, int prev = 0, int next = 0,
+ int position = 0,
enum OSDTimeout timeout = kOSDTimeout_Med);
void UpdateOSDStatus(const PlayerContext *ctx, osdInfo &info,
int type, enum OSDTimeout timeout);

0 comments on commit 0a4eb5f

Please sign in to comment.