summaryrefslogtreecommitdiff
path: root/src/xine-engine/vo_scale.c
diff options
context:
space:
mode:
authorDaniel Caujolle-Bert <f1rmb@users.sourceforge.net>2003-11-26 19:43:26 +0000
committerDaniel Caujolle-Bert <f1rmb@users.sourceforge.net>2003-11-26 19:43:26 +0000
commit3050d97eb83cfdfb4d04a51231acba47e6addf1c (patch)
tree4337d69086ce7d870214e7e5f6a028f8b417521e /src/xine-engine/vo_scale.c
parentae2a2a8e08ab3140d5c7ee3a5f33e7db81f76b09 (diff)
downloadxine-lib-3050d97eb83cfdfb4d04a51231acba47e6addf1c.tar.gz
xine-lib-3050d97eb83cfdfb4d04a51231acba47e6addf1c.tar.bz2
lprintf cleanup, pass I.
CVS patchset: 5796 CVS date: 2003/11/26 19:43:26
Diffstat (limited to 'src/xine-engine/vo_scale.c')
-rw-r--r--src/xine-engine/vo_scale.c23
1 files changed, 11 insertions, 12 deletions
diff --git a/src/xine-engine/vo_scale.c b/src/xine-engine/vo_scale.c
index d915382d7..170e3158a 100644
--- a/src/xine-engine/vo_scale.c
+++ b/src/xine-engine/vo_scale.c
@@ -17,7 +17,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*
- * $Id: vo_scale.c,v 1.26 2003/11/11 18:45:01 f1rmb Exp $
+ * $Id: vo_scale.c,v 1.27 2003/11/26 19:43:38 f1rmb Exp $
*
* Contains common code to calculate video scaling parameters.
* In short, it will map frame dimensions to screen/window size.
@@ -28,14 +28,16 @@
#include <string.h>
#include <math.h>
-#include "xine_internal.h"
-#include "video_out.h"
-#include "vo_scale.h"
-
+#define LOG_MODULE "vo_scale"
+#define LOG_VERBOSE
/*
#define LOG
*/
+#include "xine_internal.h"
+#include "video_out.h"
+#include "vo_scale.h"
+
/*
* convert delivered height/width to ideal width/height
* taking into account aspect ratio and zoom factor
@@ -175,13 +177,10 @@ void _x_vo_scale_compute_output_size (vo_scale_t *this) {
this->displayed_xoffset = (this->delivered_width - this->displayed_width) / 2;
this->displayed_yoffset = (this->delivered_height - this->displayed_height) / 2;
-#ifdef LOG
- printf ("vo_scale: frame source %d x %d (%d x %d) => screen output %d x %d\n",
- this->delivered_width, this->delivered_height,
- this->displayed_width, this->displayed_height,
- this->output_width, this->output_height);
-#endif
-
+ lprintf ("frame source %d x %d (%d x %d) => screen output %d x %d\n",
+ this->delivered_width, this->delivered_height,
+ this->displayed_width, this->displayed_height,
+ this->output_width, this->output_height);
/* calculate borders */
if (this->output_height < this->gui_height) {