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

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

diff --git a/cinelerra-5.1/cinelerra/fileogg.h b/cinelerra-5.1/cinelerra/fileogg.h
index 7225e7eda4a1d576628a9c13aa889da357ee473c..26a68022d74d82d0a5df6b7b45ced240e8e19253 100644 (file)
--- a/cinelerra-5.1/cinelerra/fileogg.h
+++ b/cinelerra-5.1/cinelerra/fileogg.h
@@ -22,7 +22,7 @@
 #ifndef FILEOGG_H
 #define FILEOGG_H
 
-#include "../config.h"
+#include "edl.inc"
 #include "filebase.h"
 #include "file.inc"
 #include "packagingengine.h"
@@ -103,10 +103,8 @@ public:
        ~FileOGG();
 
        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);
@@ -151,7 +149,7 @@ private:
        int ogg_decode_more_samples(sync_window_t *sw, long serialno);
 
        int ogg_get_page_of_frame(sync_window_t *sw, long serialno, ogg_page *og, int64_t frame);
-       int ogg_seek_to_keyframe(sync_window_t *sw, long serialno, int64_t frame, int64_t *keyframe_number);
+       int ogg_seek_to_keyframe(sync_window_t *sw, long serialno, int64_t frame, int64_t *position);
        int ogg_seek_to_databegin(sync_window_t *sw, long serialno);