Index: mythplugins/mythvideo/theme/default/video-ui.xml
===================================================================
--- mythplugins/mythvideo/theme/default/video-ui.xml (revision 20445)
+++ mythplugins/mythvideo/theme/default/video-ui.xml (working copy)
@@ -477,11 +477,23 @@
+
+
+
+
30,90,203,311
yes
@@ -493,13 +505,13 @@
@@ -586,11 +598,23 @@
+
+
+
+
15,0,770,585
grid
@@ -662,7 +686,7 @@
@@ -728,24 +752,33 @@
baselarge
+
+
+
+
+
+
+
+
+
+ 50,380,400,30
+ basemedium
+
+
+
+ 50,420,400,30
+ basemedium
+
+
- 50,367,450,30
+ 50,467,450,30
- 500,367,80,30
+ 500,467,80,30
right
- 40,395,530,80
+ 40,495,530,80
left,top
yes
yes
- 60,480,505,70
+ 60,580,505,70
left,top
yes
no
- 266,555,266,40
+ 266,655,266,40
basemedium
hcenter,vcenter
@@ -843,7 +876,7 @@
- 10,50,1260,50
+ 10,30,760,50
Edit Video Information
hcenter,vcenter
baselarge
@@ -852,134 +885,259 @@
- 250,110,250,40
- Name:
+ 50,80,250,40
+ Title:
right,top
+
+ 50,138,250,40
+ Subtitle:
+ right,top
+
+
+
+ 50,185,250,40
+ Season:
+ right,top
+
+
+
+ 370,185,150,40
+ Episode:
+ right,top
+
+
- 250,172
+ 420,232,150,40
+ right
Category:
- 250,222
+ 20,232,200,40
+ right
Parental Control:
- 250,267
+ 20,277,200,40
+ right
File to Always Play Next:
- 250,312
+ 470,277,280,40
+ left
Include while Browsing:
- 250,348
+ 50,328
Cover Art:
- 250,377
+ 50,357
Screenshot:
- 250,406
+ 50,386
Banner:
- 250,435
+ 50,415
Fanart:
- 250,464
+ 50,447
Trailer:
- 250,510
+ 50,487
Unique Player Command:
- 510,100
+ 310,70
-
- 510,165
-
+
+ 310,126
+
+
+ 310,181
+
+
+
+ 530,181
+
+
- 510,215
+ 230,225
+
+ 580,225
+
+
- 510,260
+ 230,270
- 510,310
+ 735,275
-
+
+ 540,284,200,30
+ center
+
+
430,284,800,30
right
@@ -885,70 +896,119 @@
- 50,135,250,40
- Name:
+ 150,80,250,40
+ Title:
right,top
+
+ 150,138,250,40
+ Subtitle:
+ right,top
+
+
+
+ 200,185,250,40
+ Season:
+ right,top
+
+
+
+ 520,185,150,40
+ Episode:
+ right,top
+
+
- 50,197
+ 520,232,150,40
+ right
Category:
- 50,247
+ 120,232,200,40
+ right
Parental Control:
- 50,292
+ 120,277,200,40
+ right
File to Always Play Next:
- 50,337
+ 570,277,280,40
+ left
Include while Browsing:
- 50,375
+ 200,328
Cover Art:
+
+ 200,357
+ Screenshot:
+
+
+
+ 200,386
+ Banner:
+
+
+
+ 200,415
+ Fanart:
+
+
- 50,405
+ 200,447
Trailer:
- 50,445
+ 150,487
Unique Player Command:
- 310,125
+ 410,70
-
- 310,190
-
+
+ 410,126
+
+
+ 460,181
+
+
+
+ 680,181
+
+
- 310,240
+ 330,225
+
+ 680,225
+
+
- 310,285
+ 330,270
- 310,335
+ 835,275
- 310,370,32,32
+ 460,323,32,32
@@ -970,12 +1030,93 @@
- 350,375,250,40
+ 500,328,250,40
/path/to/the/thing.jpg
+
+ 460,352,32,32
+
+
+
+ blankbutton_off.png
+
+
+
+
+ blankbutton_on.png
+
+
+
+
+
+ blankbutton_pushed.png
+
+
+
+
+
+
+ 500,357,250,40
+ /path/to/the/thing.jpg
+
+
+
+ 460,381,32,32
+
+
+
+ blankbutton_off.png
+
+
+
+
+ blankbutton_on.png
+
+
+
+
+
+ blankbutton_pushed.png
+
+
+
+
+
+
+ 500,386,250,40
+ /path/to/the/thing.jpg
+
+
+
+ 460,412,32,32
+
+
+
+ blankbutton_off.png
+
+
+
+
+ blankbutton_on.png
+
+
+
+
+
+ blankbutton_pushed.png
+
+
+
+
+
+
+ 500,415,250,40
+ /path/to/the/thing.jpg
+
+
- 310,400,32,32
+ 460,442,32,32
@@ -997,16 +1138,18 @@
- 350,405,250,40
+ 500,447,250,40
/path/to/the/thing.jpg
+
- 310,435
+ 410,477
- 310,505
+ 510,537
+ Done
Index: mythtv/libs/libmythui/mythmainwindow.cpp
===================================================================
--- mythtv/libs/libmythui/mythmainwindow.cpp (revision 20445)
+++ mythtv/libs/libmythui/mythmainwindow.cpp (working copy)
@@ -1303,7 +1303,9 @@
bool MythMainWindow::HandleMedia(const QString &handler, const QString &mrl,
const QString &plot, const QString &title,
- const QString &director, int lenMins,
+ const QString &subtitle,
+ const QString &director, int season,
+ int episode, int lenMins,
const QString &year)
{
QString lhandler(handler);
@@ -1313,8 +1315,9 @@
// Let's see if we have a plugin that matches the handler name...
if (d->mediaPluginMap.count(lhandler))
{
- d->mediaPluginMap[lhandler].playFn(mrl, plot, title,
- director, lenMins, year);
+ d->mediaPluginMap[lhandler].playFn(mrl, plot, title, subtitle,
+ director, season, episode, lenMins,
+ year);
return true;
}
Index: mythtv/libs/libmythui/mythmainwindow.h
===================================================================
--- mythtv/libs/libmythui/mythmainwindow.h (revision 20445)
+++ mythtv/libs/libmythui/mythmainwindow.h (working copy)
@@ -17,7 +17,7 @@
#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)
-typedef int (*MediaPlayCallback)(const QString &, const QString &, const QString &, const QString &, int, const QString &);
+typedef int (*MediaPlayCallback)(const QString &, const QString &, const QString &, const QString &, const QString &, int, int, int, const QString &);
class MythMainWindowPrivate;
@@ -63,7 +63,8 @@
bool HandleMedia(const QString& handler, const QString& mrl,
const QString& plot="", const QString& title="",
- const QString& director="", int lenMins=120,
+ const QString& subtitle="", const QString& director="",
+ int season=0, int episode=0, int lenMins=120,
const QString& year="1895");
void JumpTo(const QString &destination, bool pop = true);
Index: mythtv/programs/mythfrontend/main.cpp
===================================================================
--- mythtv/programs/mythfrontend/main.cpp (revision 20445)
+++ mythtv/programs/mythfrontend/main.cpp (working copy)
@@ -665,7 +665,8 @@
}
int internal_play_media(const QString &mrl, const QString &plot,
- const QString &title, const QString &director,
+ const QString &title, const QString &subtitle,
+ const QString &director, int season, int episode,
int lenMins, const QString &year)
{
int res = -1;
@@ -704,12 +705,26 @@
pginfo->pathname = QString("dvd:%1").arg(mrl);
}
- pginfo->description = plot;
-
if (director.length())
- pginfo->subtitle = QString( "%1: %2" )
+ pginfo->description = QString( "%1: %2. " )
.arg(QObject::tr("Directed By")).arg(director);
+ pginfo->description += plot;
+
+ if (subtitle.length())
+ pginfo->subtitle = subtitle;
+
+ if ((season > 0) || (episode > 0))
+ {
+ QString seas, ep;
+ seas = QString::number(season);
+ ep = QString::number(episode);
+ if (ep.size() < 2)
+ ep.prepend("0");
+ QString SeasEpTitle = QString("%1x%2").arg(seas).arg(ep);
+ pginfo->chanstr = SeasEpTitle;
+ }
+
pginfo->title = title;
if (pginfo->pathname.startsWith("dvd:"))