fix drag handle segv, new app icons

[goodguy/history.git] / cinelerra-5.1 / cinelerra / fileppm.C

diff --git a/cinelerra-5.1/cinelerra/fileppm.C b/cinelerra-5.1/cinelerra/fileppm.C
index ac991aa41f80789264d9ee0625ebeed848a46f2e..7df92707a11e56d567b9e68424bbff2ec28a1f60 100644 (file)
--- a/cinelerra-5.1/cinelerra/fileppm.C
+++ b/cinelerra-5.1/cinelerra/fileppm.C
@@ -199,7 +199,11 @@ PPMConfigVideo::PPMConfigVideo(BC_WindowBase *gui, Asset *asset)
 {
        this->gui = gui;
        this->asset = asset;
-       lock_window("PPMConfigVideo::create_objects()");
+}
+
+void PPMConfigVideo::create_objects()
+{
+       lock_window("PPMConfigVideo::create_objects");
        int x = 10, y = 10;
        add_subwindow(new BC_Title(x, y, _("PPM, RGB raw only")));
        add_subwindow(new BC_OKButton(this));
@@ -207,11 +211,13 @@ PPMConfigVideo::PPMConfigVideo(BC_WindowBase *gui, Asset *asset)
        unlock_window();
 }
 
-void FilePPM::get_parameters(BC_WindowBase *parent_window, Asset *asset,
-       BC_WindowBase* &format_window, int audio_options, int video_options)
+void FilePPM::get_parameters(BC_WindowBase *parent_window,
+       Asset *asset, BC_WindowBase* &format_window,
+       int audio_options, int video_options, EDL *edl)
 {
        if(video_options) {
                PPMConfigVideo *window = new PPMConfigVideo(parent_window, asset);
+               window->create_objects();
                format_window = window;
                window->run_window();
                delete window;