Merge CV, ver=5.1; ops/methods from HV, and interface from CV where possible

[goodguy/history.git] / cinelerra-5.0 / cinelerra / awindow.C

diff --git a/cinelerra-5.0/cinelerra/awindow.C b/cinelerra-5.0/cinelerra/awindow.C
deleted file mode 100644 (file)
index f338f0e..0000000
--- a/cinelerra-5.0/cinelerra/awindow.C
+++ /dev/null
@@ -1,79 +0,0 @@
-
-/*
- * CINELERRA
- * Copyright (C) 1997-2012 Adam Williams <broadcast at earthling dot net>
- * 
- * 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
- * 
- */
-
-#include "assetedit.h"
-#include "assetremove.h"
-#include "awindow.h"
-#include "awindowgui.h"
-#include "bcsignals.h"
-#include "clipedit.h"
-
-AWindow::AWindow(MWindow *mwindow)
- : Thread(1, 0, 0)
-{
-       this->mwindow = mwindow;
-       current_folder[0] = 0;
-       asset_remove = 0;
-       asset_edit = 0;
-       clip_edit = 0;
-}
-
-
-AWindow::~AWindow()
-{
-       if(gui) {
-               gui->lock_window("AWindow::~AWindow");
-               gui->set_done(0);
-               gui->unlock_window();
-               Thread::join();
-       }
-       delete asset_remove;
-       delete asset_edit;
-       delete clip_edit;
-}
-
-void AWindow::create_objects()
-{
-       gui = new AWindowGUI(mwindow, this);
-       gui->create_objects();
-       gui->lock_window("AWindow::create_objects");
-       gui->update_assets();
-       gui->unlock_window();
-       asset_remove = new AssetRemoveThread(mwindow);
-       asset_edit = new AssetEdit(mwindow);
-       clip_edit = new ClipEdit(mwindow, this, 0);
-}
-
-int AWindow::save_defaults(BC_Hash *defaults)
-{
-       return gui->save_defaults(defaults);
-}
-int AWindow::load_defaults(BC_Hash *defaults)
-{
-       return gui->load_defaults(defaults);
-}
-
-
-void AWindow::run()
-{
-       gui->run_window();
-       delete gui;  gui = 0;
-}