From 170a16fb3e8b4ec51ef0322d4f3ebf783bf43c5a Mon Sep 17 00:00:00 2001 From: Marcus Overhagen Date: Mon, 23 Apr 2007 19:04:05 +0000 Subject: [PATCH] added Jamfile for DVB TV application and fixed compilation problems after refactoring git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@20781 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/apps/Jamfile | 1 + src/apps/tv/Jamfile | 13 +++++++++++++ src/apps/tv/VideoView.cpp | 9 +++++---- src/apps/tv/config.h | 6 +++--- src/apps/tv/tv.rdef | 0 5 files changed, 22 insertions(+), 7 deletions(-) create mode 100644 src/apps/tv/Jamfile create mode 100644 src/apps/tv/tv.rdef diff --git a/src/apps/Jamfile b/src/apps/Jamfile index db2cee9766..6b72fb40fb 100644 --- a/src/apps/Jamfile +++ b/src/apps/Jamfile @@ -29,4 +29,5 @@ SubInclude HAIKU_TOP src apps soundrecorder ; SubInclude HAIKU_TOP src apps stylededit ; SubInclude HAIKU_TOP src apps terminal ; SubInclude HAIKU_TOP src apps tracker ; +SubInclude HAIKU_TOP src apps tv ; SubInclude HAIKU_TOP src apps workspaces ; diff --git a/src/apps/tv/Jamfile b/src/apps/tv/Jamfile new file mode 100644 index 0000000000..d6051045b5 --- /dev/null +++ b/src/apps/tv/Jamfile @@ -0,0 +1,13 @@ +SubDir HAIKU_TOP src apps tv ; + +Application TV : + Controller.cpp + ConvertBitmap.cpp + DeviceRoster.cpp + MainApp.cpp + MainWin.cpp + VideoNode.cpp + VideoView.cpp + : be media + : tv.rdef +; diff --git a/src/apps/tv/VideoView.cpp b/src/apps/tv/VideoView.cpp index be17d1cbed..88c89b50f6 100644 --- a/src/apps/tv/VideoView.cpp +++ b/src/apps/tv/VideoView.cpp @@ -30,6 +30,7 @@ #include "ConvertBitmap.h" #include +#include #include #define CHECK_ACTIVITY 'ChkA' @@ -383,10 +384,10 @@ VideoView::IsOverlaySupported() printf("Overlay restrictions: destination max_width %d\n", restrict.destination.max_width); printf("Overlay restrictions: destination min_height %d\n", restrict.destination.min_height); printf("Overlay restrictions: destination max_height %d\n", restrict.destination.max_height); - printf("Overlay restrictions: min_width_scale %d\n", restrict.min_width_scale); - printf("Overlay restrictions: max_width_scale %d\n", restrict.max_width_scale); - printf("Overlay restrictions: min_height_scale %d\n", restrict.min_height_scale); - printf("Overlay restrictions: max_height_scale %d\n", restrict.max_height_scale); + printf("Overlay restrictions: min_width_scale %.3f\n", restrict.min_width_scale); + printf("Overlay restrictions: max_width_scale %.3f\n", restrict.max_width_scale); + printf("Overlay restrictions: min_height_scale %.3f\n", restrict.min_height_scale); + printf("Overlay restrictions: max_height_scale %.3f\n", restrict.max_height_scale); } supported = true; } diff --git a/src/apps/tv/config.h b/src/apps/tv/config.h index a6bc0acf19..f14b4c6962 100644 --- a/src/apps/tv/config.h +++ b/src/apps/tv/config.h @@ -27,13 +27,13 @@ #include #include -#include "revision.h" #define NAME "TV-O-Rama" +#define REVISION "unknown" #define VERSION "1.1" #define BUILD __DATE__ " "__TIME__ -#define COPYRIGHT B_UTF8_COPYRIGHT" Marcus Overhagen 2005-2006" +#define COPYRIGHT B_UTF8_COPYRIGHT" Marcus Overhagen 2005-2007" #define INFO1 "DVB - Digital Video Broadcasting TV" -#define APP_SIG "application/x-vnd.MarcusOverhagen."##NAME +#define APP_SIG "application/x-vnd.MarcusOverhagen."NAME #endif diff --git a/src/apps/tv/tv.rdef b/src/apps/tv/tv.rdef new file mode 100644 index 0000000000..e69de29bb2