Fix 1818856: External application render targets seem to be broken. We can't use...

[synfig.git] / synfig-core / trunk / src / modules / mod_dv / trgt_dv.cpp

diff --git a/synfig-core/trunk/src/modules/mod_dv/trgt_dv.cpp b/synfig-core/trunk/src/modules/mod_dv/trgt_dv.cpp
index e92975d..18dc1cd 100644 (file)
--- a/synfig-core/trunk/src/modules/mod_dv/trgt_dv.cpp
+++ b/synfig-core/trunk/src/modules/mod_dv/trgt_dv.cpp
@@ -1,18 +1,22 @@
-/*! ========================================================================
-** Synfig
-** ppm Target Module
-** $Id: trgt_dv.cpp,v 1.1.1.1 2005/01/04 01:23:10 darco Exp $
+/* === S Y N F I G ========================================================= */
+/*!    \file trgt_dv.cpp
+**     \brief ppm Target Module
 **
-** Copyright (c) 2002 Robert B. Quattlebaum Jr.
+**     $Id$
 **
-** This software and associated documentation
-** are CONFIDENTIAL and PROPRIETARY property of
-** the above-mentioned copyright holder.
+**     \legal
+**     Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
 **
-** You may not copy, print, publish, or in any
-** other way distribute this software without
-** a prior written agreement with
-** the copyright holder.
+**     This package is free software; you can redistribute it and/or
+**     modify it under the terms of the GNU General Public License as
+**     published by the Free Software Foundation; either version 2 of
+**     the License, or (at your option) any later version.
+**
+**     This package is distributed in the hope that it will be useful,
+**     but WITHOUT ANY WARRANTY; without even the implied warranty of
+**     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+**     General Public License for more details.
+**     \endlegal
 **
 ** === N O T E S ===========================================================
 **
@@ -50,7 +54,7 @@ SYNFIG_TARGET_INIT(dv_trgt);
 SYNFIG_TARGET_SET_NAME(dv_trgt,"dv");
 SYNFIG_TARGET_SET_EXT(dv_trgt,"dv");
 SYNFIG_TARGET_SET_VERSION(dv_trgt,"0.1");
-SYNFIG_TARGET_SET_CVS_ID(dv_trgt,"$Id: trgt_dv.cpp,v 1.1.1.1 2005/01/04 01:23:10 darco Exp $");
+SYNFIG_TARGET_SET_CVS_ID(dv_trgt,"$Id$");
 
 /* === M E T H O D S ======================================================= */
 
@@ -77,13 +81,13 @@ dv_trgt::~dv_trgt()
 
 bool
 dv_trgt::set_rend_desc(RendDesc *given_desc)
-{      
+{
        // Set the aspect ratio
        if(wide_aspect)
        {
                // 16:9 Aspect
                given_desc->set_wh(160,90);
-               
+
                // Widescreen should be progressive scan
                given_desc->set_interlaced(false);
        }
@@ -91,23 +95,23 @@ dv_trgt::set_rend_desc(RendDesc *given_desc)
        {
                // 4:3 Aspect
                given_desc->set_wh(400,300);
-               
+
                // We should be interlaced
                given_desc->set_interlaced(true);
        }
-       
+
        // but the pixel res should be 720x480
        given_desc->clear_flags(),given_desc->set_wh(720,480);
-               
+
        // NTSC Frame rate is 29.97
        given_desc->set_frame_rate(29.97);
-       
+
        // The pipe to encodedv is PPM, which needs RGB data
        //given_desc->set_pixel_format(PF_RGB);
-       
+
        // Set the description
        desc=*given_desc;
-       
+
        return true;
 }
 
@@ -115,17 +119,17 @@ bool
 dv_trgt::init()
 {
        imagecount=desc.get_frame_start();
-       
+
        string command;
-       
+
        if(wide_aspect)
                command=strprintf("encodedv -w 1 - > \"%s\"\n",filename.c_str());
        else
                command=strprintf("encodedv - > \"%s\"\n",filename.c_str());
-       
+
        // Open the pipe to encodedv
-       file=popen(command.c_str(),"w");
-       
+       file=popen(command.c_str(),POPEN_BINARY_WRITE_TYPE);
+
        if(!file)
        {
                synfig::error(_("Unable to open pipe to encodedv"));
@@ -133,7 +137,7 @@ dv_trgt::init()
        }
 
        // Sleep for a moment to let the pipe catch up
-       etl::clock().sleep(0.25f);      
+       etl::clock().sleep(0.25f);
 
        return true;
 }
@@ -147,28 +151,28 @@ dv_trgt::end_frame()
 }
 
 bool
-dv_trgt::start_frame(synfig::ProgressCallback *callback)
+dv_trgt::start_frame(synfig::ProgressCallback */*callback*/)
 {
        int w=desc.get_w(),h=desc.get_h();
-               
+
        if(!file)
                return false;
-       
+
        fprintf(file, "P6\n");
        fprintf(file, "%d %d\n", w, h);
-       fprintf(file, "%d\n", 255);     
-       
+       fprintf(file, "%d\n", 255);
+
        delete [] buffer;
        buffer=new unsigned char[3*w];
 
        delete [] color_buffer;
        color_buffer=new Color[w];
-       
+
        return true;
 }
 
 Color *
-dv_trgt::start_scanline(int scanline)
+dv_trgt::start_scanline(int /*scanline*/)
 {
        return color_buffer;
 }
@@ -180,9 +184,9 @@ dv_trgt::end_scanline()
                return false;
 
        convert_color_format(buffer, color_buffer, desc.get_w(), PF_RGB, gamma());
-                       
+
        if(!fwrite(buffer,1,desc.get_w()*3,file))
                return false;
-       
+
        return true;
 }