rework histogram_bezier, init wm icon set_icon(gg), update de.po+msg/txt

[goodguy/history.git] / cinelerra-5.1 / cinelerra / filedv.h

diff --git a/cinelerra-5.1/cinelerra/filedv.h b/cinelerra-5.1/cinelerra/filedv.h
index 6ae4d6793152d252de166adcf54b341ebe00ce50..64e867e9fdf1b9a3401d2c82dc3d0a5bf2e0f0cb 100644 (file)
--- a/cinelerra-5.1/cinelerra/filedv.h
+++ b/cinelerra-5.1/cinelerra/filedv.h
@@ -2,21 +2,21 @@
 /*
  * CINELERRA
  * Copyright (C) 2004 Richard Baverstock
- * 
+ *
  * This program 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 program 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.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- * 
+ *
  */
 
 #ifndef FILEDV_H
@@ -24,7 +24,7 @@
 
 #ifdef HAVE_DV
 
-#include "../config.h"
+#include "edl.inc"
 #include "filebase.h"
 #include "file.inc"
 
@@ -42,42 +42,40 @@ public:
        ~FileDV();
 
        static void get_parameters(BC_WindowBase *parent_window,
-               Asset *asset,
-               BC_WindowBase* &format_window,
-               int audio_options,
-               int video_options);
-       
+               Asset *asset, BC_WindowBase* &format_window,
+               int audio_options, int video_options, EDL *edl);
+
        int reset_parameters_derived();
        int open_file(int rd, int wr);
 
        static int check_sig(Asset *asset);
        int close_file_derived();
-       
+
        int64_t get_video_position();
        int64_t get_audio_position();
-       
+
        int set_video_position(int64_t x);
        int set_audio_position(int64_t x);
 
        int audio_samples_copy(double **buffer, int64_t len);
-       
+
        int write_samples(double **buffer, int64_t len);
        int write_frames(VFrame ***frames, int len);
-       
+
        int read_compressed_frame(VFrame *buffer);
        int write_compressed_frame(VFrame *buffers);
-       
+
        int64_t compressed_frame_size();
-       
+
        int read_samples(double *buffer, int64_t len);
        int read_frame(VFrame *frame);
-       
+
        int colormodel_supported(int colormodel);
-       
+
        int can_copy_from(Edit *edit, int64_t position);
-       
+
        static int get_best_colormodel(Asset *asset, int driver);
-       
+
        int get_audio_frame(int64_t pos);
        int get_audio_offset(int64_t pos);
 
@@ -87,14 +85,14 @@ private:
        Mutex *stream_lock;
        Mutex *decoder_lock;
        Mutex *video_position_lock;
-       
+
        dv_decoder_t *decoder;
        dv_encoder_t *encoder;
        dv_encoder_t *audio_encoder;
-               
+
        int64_t audio_position;
        int64_t video_position;
-       
+
        unsigned char *video_buffer;
        unsigned char *audio_buffer;
 
@@ -103,9 +101,9 @@ private:
        int audio_sample_buffer_end;
        int audio_sample_buffer_len;
        int audio_sample_buffer_maxsize;
-       
+
        int audio_frames_written;
-       
+
        int output_size;
        int isPAL;
 };