4 changes: 2 additions & 2 deletions mythtv/libs/libmythui/mythmainwindow.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1482,7 +1482,7 @@ bool MythMainWindow::HandleMedia(const QString& Handler, const QString& Mrl,
const QString& Subtitle,
const QString& Director, int Season,
int Episode, const QString& Inetref,
int LenMins, const QString& Year,
std::chrono::minutes LenMins, const QString& Year,
const QString& Id, bool UseBookmarks)
{
QString lhandler(Handler);
Expand Down Expand Up @@ -1952,7 +1952,7 @@ void MythMainWindow::customEvent(QEvent* Event)
event->ExtraData(1), event->ExtraData(2),
event->ExtraData(3), event->ExtraData(4),
event->ExtraData(5).toInt(), event->ExtraData(6).toInt(),
event->ExtraData(7), event->ExtraData(8).toInt(),
event->ExtraData(7), std::chrono::minutes(event->ExtraData(8).toInt()),
event->ExtraData(9), event->ExtraData(10),
usebookmark);
}
Expand Down
4 changes: 2 additions & 2 deletions mythtv/libs/libmythui/mythmainwindow.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ class MythMediaDevice;
#define REG_JUMPEX(a, b, c, d, e) GetMythMainWindow()->RegisterJump(a, b, c, d, e)
#define REG_MEDIAPLAYER(a,b,c) GetMythMainWindow()->RegisterMediaPlugin(a, b, c)

using MediaPlayCallback = int (*)(const QString& , const QString& , const QString& , const QString& , const QString& , int, int, const QString& , int, const QString& , const QString& , bool);
using MediaPlayCallback = int (*)(const QString& , const QString& , const QString& , const QString& , const QString& , int, int, const QString& , std::chrono::minutes, const QString& , const QString& , bool);

class MythScreenSaverControl;
class MythDisplay;
Expand Down Expand Up @@ -78,7 +78,7 @@ class MUI_PUBLIC MythMainWindow : public MythUIScreenBounds
const QString& Plot="", const QString& Title="",
const QString& Subtitle="", const QString& Director="",
int Season=0, int Episode=0, const QString& Inetref="",
int LenMins=120, const QString& Year="1895",
std::chrono::minutes LenMins=2h, const QString& Year="1895",
const QString& Id="", bool UseBookmarks = false);
void HandleTVAction(const QString& Action);

Expand Down
2 changes: 1 addition & 1 deletion mythtv/programs/mythbackend/services/serviceUtil.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -424,7 +424,7 @@ void FillVideoMetadataInfo (
QTime(0,0),Qt::LocalTime).toUTC());
pVideoMetadataInfo->setUserRating(pMetadata->GetUserRating());
pVideoMetadataInfo->setChildID(pMetadata->GetChildID());
pVideoMetadataInfo->setLength(pMetadata->GetLength());
pVideoMetadataInfo->setLength(pMetadata->GetLength().count());
pVideoMetadataInfo->setPlayCount(pMetadata->GetPlayCount());
pVideoMetadataInfo->setSeason(pMetadata->GetSeason());
pVideoMetadataInfo->setEpisode(pMetadata->GetEpisode());
Expand Down
8 changes: 4 additions & 4 deletions mythtv/programs/mythbackend/services/video.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,7 @@ DTC::VideoLookupList* Video::LookupVideo( const QString &Title,
QDateTime(lookup->GetReleaseDate(),
QTime(0,0),Qt::LocalTime).toUTC());
pVideoLookup->setUserRating(lookup->GetUserRating());
pVideoLookup->setLength(lookup->GetRuntime());
pVideoLookup->setLength(lookup->GetRuntime().count());
pVideoLookup->setLanguage(lookup->GetLanguage());
pVideoLookup->setCountries(lookup->GetCountries());
pVideoLookup->setPopularity(lookup->GetPopularity());
Expand Down Expand Up @@ -584,7 +584,7 @@ bool Video::UpdateVideoMetadata ( int nId,

if (m_parsedParams.contains("length"))
{
metadata->SetLength(nLength);
metadata->SetLength(std::chrono::minutes(nLength));
update_required = true;
}

Expand Down Expand Up @@ -881,7 +881,7 @@ long Video::GetSavedBookmark( int Id )
0, // int _season,
0, // int _episode,
nullptr, // const QString &_inetref,
0, // uint _length_in_minutes,
0min, // uint _length_in_minutes,
0, // uint _year,
nullptr); //const QString &_programid);

Expand Down Expand Up @@ -928,7 +928,7 @@ bool Video::SetSavedBookmark( int Id, long Offset )
0, // int _season,
0, // int _episode,
nullptr, // const QString &_inetref,
0, // uint _length_in_minutes,
0min, // uint _length_in_minutes,
0, // uint _year,
nullptr); //const QString &_programid);

Expand Down
4 changes: 2 additions & 2 deletions mythtv/programs/mythfrontend/editvideometadata.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -315,7 +315,7 @@ void EditMetadataDialog::fillWidgets()
if (m_lengthSpin)
{
m_lengthSpin->SetRange(0,999,1,15);
m_lengthSpin->SetValue(m_workingMetadata->GetLength());
m_lengthSpin->SetValue(m_workingMetadata->GetLength().count());
}

// No memory leak. MythUIButtonListItem adds the new item into
Expand Down Expand Up @@ -585,7 +585,7 @@ void EditMetadataDialog::SetUserRating()

void EditMetadataDialog::SetLength()
{
m_workingMetadata->SetLength(m_lengthSpin->GetIntValue());
m_workingMetadata->SetLength(m_lengthSpin->GetDuration<std::chrono::minutes>());
}

void EditMetadataDialog::SetPlayer()
Expand Down
7 changes: 4 additions & 3 deletions mythtv/programs/mythfrontend/main.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -759,7 +759,7 @@ static void playDisc()
QString filename = QString("bd:/%1").arg(bluray_mountpoint);

GetMythMainWindow()->HandleMedia("Internal", filename, "", "", "", "",
0, 0, "", 0, "", "", true);
0, 0, "", 0min, "", "", true);

GetMythUI()->RemoveCurrentLocation();
}
Expand Down Expand Up @@ -787,7 +787,7 @@ static void playDisc()

command_string = "Internal";
GetMythMainWindow()->HandleMedia(command_string, filename, "", "",
"", "", 0, 0, "", 0, "", "", true);
"", "", 0, 0, "", 0min, "", "", true);
GetMythUI()->RemoveCurrentLocation();

return;
Expand Down Expand Up @@ -1263,7 +1263,8 @@ static void WriteDefaults()
static int internal_play_media(const QString &mrl, const QString &plot,
const QString &title, const QString &subtitle,
const QString &director, int season, int episode,
const QString &inetref, int lenMins, const QString &year,
const QString &inetref, std::chrono::minutes lenMins,
const QString &year,
const QString &id, const bool useBookmark)
{
int res = -1;
Expand Down
2 changes: 1 addition & 1 deletion mythtv/programs/mythfrontend/services/frontend.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -235,7 +235,7 @@ bool Frontend::PlayVideo(const QString &Id, bool UseBookmark)
<< metadata->GetSubtitle() << metadata->GetDirector()
<< QString::number(metadata->GetSeason())
<< QString::number(metadata->GetEpisode())
<< metadata->GetInetRef() << QString::number(metadata->GetLength())
<< metadata->GetInetRef() << QString::number(metadata->GetLength().count())
<< QString::number(metadata->GetYear())
<< QString::number(metadata->GetID())
<< QString::number(static_cast<int>(UseBookmark));
Expand Down
2 changes: 1 addition & 1 deletion mythtv/programs/mythfrontend/videodlg.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3751,7 +3751,7 @@ void VideoDialog::OnVideoSearchDone(MetadataLookup *lookup)
metadata->SetUserRating(lookup->GetUserRating());
if (metadata->GetRating() == VIDEO_RATING_DEFAULT)
metadata->SetRating(lookup->GetCertification());
if (metadata->GetLength() == 0)
if (metadata->GetLength() == 0min)
metadata->SetLength(lookup->GetRuntime());
if (metadata->GetSeason() == 0)
metadata->SetSeason(lookup->GetSeason());
Expand Down
10 changes: 5 additions & 5 deletions mythtv/programs/mythfrontend/videofilter.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -261,11 +261,11 @@ bool VideoFilterSettings::matches_filter(const VideoMetadata &mdata) const
{
if (m_runtime == kRuntimeFilterUnknown)
{
matches = (mdata.GetLength() == 0);
matches = (mdata.GetLength() == 0min);
}
else
{
matches = (m_runtime == (mdata.GetLength() / 30));
matches = (m_runtime == (mdata.GetLength() / 30min));
}
}

Expand Down Expand Up @@ -546,11 +546,11 @@ void VideoFilterDialog::fillWidgets()
else
years.insert(year);

int runtime = md->GetLength();
if (runtime == 0)
std::chrono::minutes runtime = md->GetLength();
if (runtime == 0min)
have_unknown_runtime = true;
else
runtimes.insert(runtime / 30);
runtimes.insert(runtime.count() / 30);

user_ratings.insert(static_cast<int>(md->GetUserRating()));
}
Expand Down
10 changes: 5 additions & 5 deletions mythtv/programs/mythfrontend/videoplayercommand.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ class VideoPlayHandleMedia : public VideoPlayProc
VideoPlayHandleMedia(QString handler, QString mrl,
QString plot, QString title, QString subtitle,
QString director, int season, int episode, QString inetref,
int length, QString year, QString id) :
std::chrono::minutes length, QString year, QString id) :
m_handler(std::move(handler)), m_mrl(std::move(mrl)),
m_plot(std::move(plot)), m_title(std::move(title)),
m_subtitle(std::move(subtitle)),
Expand All @@ -97,7 +97,7 @@ class VideoPlayHandleMedia : public VideoPlayProc
const QString &mrl, const QString &plot, const QString &title,
const QString &subtitle, const QString &director,
int season, int episode, const QString &inetref,
int length, const QString &year, const QString &id)
std::chrono::minutes length, const QString &year, const QString &id)
{
return new VideoPlayHandleMedia(handler, mrl, plot, title, subtitle,
director, season, episode, inetref, length, year, id);
Expand Down Expand Up @@ -130,7 +130,7 @@ class VideoPlayHandleMedia : public VideoPlayProc
int m_season;
int m_episode;
QString m_inetref;
int m_length;
std::chrono::minutes m_length;
QString m_year;
QString m_id;
};
Expand Down Expand Up @@ -295,7 +295,7 @@ class VideoPlayerCommandPrivate
int season = 0;
int episode = 0;
QString inetref;
int length = 0;
std::chrono::minutes length = 0min;
QString year = QString::number(VIDEO_YEAR_DEFAULT);
QString id;

Expand Down Expand Up @@ -342,7 +342,7 @@ class VideoPlayerCommandPrivate
void AddPlayer(const QString &player, const QString &filename,
const QString &plot, const QString &title, const QString &subtitle,
const QString &director, int season, int episode, const QString &inetref,
int length, const QString &year, const QString &id)
std::chrono::minutes length, const QString &year, const QString &id)
{
m_playerProcs.push_back(VideoPlayHandleMedia::Create(player, filename,
plot, title, subtitle, director, season, episode, inetref,
Expand Down
2 changes: 1 addition & 1 deletion mythtv/programs/mythpreviewgen/main.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ int preview_helper(uint chanid, QDateTime starttime,
pginfo = new ProgramInfo(
infile, ""/*plot*/, ""/*title*/, ""/*sortTitle*/, ""/*subtitle*/,
""/*sortSubtitle*/, ""/*director*/, 0/*season*/, 0/*episode*/,
""/*inetref*/, 120/*length_in_minutes*/, 1895/*year*/, ""/*id*/);
""/*inetref*/, 120min/*length_in_minutes*/, 1895/*year*/, ""/*id*/);
}
else
{
Expand Down