summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--config.c3
-rw-r--r--config.h5
-rw-r--r--device.c8
3 files changed, 12 insertions, 4 deletions
diff --git a/config.c b/config.c
index f61336f0..223a1029 100644
--- a/config.c
+++ b/config.c
@@ -4,7 +4,7 @@
* See the main source file 'xineliboutput.c' for copyright information and
* how to reach the author.
*
- * $Id: config.c,v 1.93 2010-05-27 12:04:50 phintuka Exp $
+ * $Id: config.c,v 1.94 2010-05-30 23:24:12 phintuka Exp $
*
*/
@@ -243,6 +243,7 @@ const char * const config_t::s_osdSizes[] = {
"1280x720",
"1920x1080",
trNOOP("custom"),
+ trNOOP("video stream"),
NULL
};
diff --git a/config.h b/config.h
index 2083576a..ec1ba6f3 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
* See the main source file 'xineliboutput.c' for copyright information and
* how to reach the author.
*
- * $Id: config.h,v 1.71 2010-05-27 12:04:50 phintuka Exp $
+ * $Id: config.h,v 1.72 2010-05-30 23:24:12 phintuka Exp $
*
*/
@@ -165,7 +165,8 @@
#define OSD_SIZE_1280x720 2
#define OSD_SIZE_1920x1080 3
#define OSD_SIZE_custom 4
-#define OSD_SIZE_count 5
+#define OSD_SIZE_stream 5
+#define OSD_SIZE_count 6
// Media player menu (bitmask)
#define MEDIA_MENU_FILES (1<<0)
diff --git a/device.c b/device.c
index 2bbb998a..af508165 100644
--- a/device.c
+++ b/device.c
@@ -4,7 +4,7 @@
* See the main source file 'xineliboutput.c' for copyright information and
* how to reach the author.
*
- * $Id: device.c,v 1.108 2010-05-27 11:26:40 phintuka Exp $
+ * $Id: device.c,v 1.109 2010-05-30 23:24:12 phintuka Exp $
*
*/
@@ -1613,6 +1613,12 @@ void cXinelibDevice::GetOsdSize(int &Width, int &Height, double &PixelAspect)
Width = 1920;
Height = 1080;
break;
+ case OSD_SIZE_stream:
+ if (m_VideoSize->width > 0 && m_VideoSize->height > 0) {
+ Width = max<int>(m_VideoSize->width, 512);
+ Height = max<int>(m_VideoSize->height, 480);
+ break;
+ }
case OSD_SIZE_auto:
if (xc.osd_width_auto > 0 && xc.osd_height_auto > 0) {
Width = xc.osd_width_auto;