audio wave icons, viewer wave image, 7 lib updates, tweak file size

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

diff --git a/cinelerra-5.1/cinelerra/clippopup.C b/cinelerra-5.1/cinelerra/clippopup.C
index cbd7ca04c84d9a7d3d879d621fef86e484a4b43a..07ae7252fedd46e4749f085cb09b10aaceddfadc 100644 (file)
--- a/cinelerra-5.1/cinelerra/clippopup.C
+++ b/cinelerra-5.1/cinelerra/clippopup.C
@@ -138,10 +138,11 @@ ClipPopupInfo::~ClipPopupInfo()
 int ClipPopupInfo::handle_event()
 {
        int cur_x, cur_y;
-       popup->gui->get_abs_cursor_xy(cur_x, cur_y, 0);
+       popup->gui->get_abs_cursor(cur_x, cur_y, 0);
 
        if( mwindow->session->drag_assets->total ) {
-               mwindow->awindow->asset_edit->edit_asset(
+               AssetEdit *asset_edit = mwindow->awindow->get_asset_editor();
+               asset_edit->edit_asset(
                        mwindow->session->drag_assets->values[0], cur_x, cur_y);
        }
        else
@@ -166,7 +167,7 @@ ClipPopupSort::~ClipPopupSort()
 
 int ClipPopupSort::handle_event()
 {
-       mwindow->awindow->gui->sort_assets();
+       mwindow->awindow->gui->sort_assets(0);
        return 1;
 }
 
@@ -185,7 +186,6 @@ ClipPopupView::~ClipPopupView()
 int ClipPopupView::handle_event()
 {
        VWindow *vwindow = mwindow->get_viewer(1, DEFAULT_VWINDOW);
-       vwindow->gui->lock_window("ClipPopupView::handle_event");
 
        if( mwindow->session->drag_assets->total )
                vwindow->change_source(
@@ -195,7 +195,6 @@ int ClipPopupView::handle_event()
                vwindow->change_source(
                        mwindow->session->drag_clips->values[0]);
 
-       vwindow->gui->unlock_window();
        return 1;
 }
 
@@ -253,10 +252,8 @@ int ClipPopupCopy::handle_event()
                edl->copy(start, end, 1, 0, 0, &file, "", 1);
                const char *file_string = file.string();
                long file_length = strlen(file_string);
-               gui->get_clipboard()->to_clipboard(file_string, file_length,
-                       SECONDARY_SELECTION);
-               gui->get_clipboard()->to_clipboard(file_string, file_length,
-                       BC_PRIMARY_SELECTION);
+               gui->to_clipboard(file_string, file_length, SECONDARY_SELECTION);
+               gui->to_clipboard(file_string, file_length, BC_PRIMARY_SELECTION);
        }
        gui->unlock_window(); 
        return 1;
@@ -354,10 +351,10 @@ int ClipPasteToFolder::handle_event()
 {
        MWindowGUI *gui = mwindow->gui;
        gui->lock_window("ClipPasteToFolder::handle_event 1");
-       int64_t len = gui->get_clipboard()->clipboard_len(SECONDARY_SELECTION);
+       int64_t len = gui->clipboard_len(BC_PRIMARY_SELECTION);
        if( len ) {
-               char *string = new char[len + 1];
-               gui->get_clipboard()->from_clipboard(string, len, BC_PRIMARY_SELECTION);
+               char *string = new char[len];
+               gui->from_clipboard(string, len, BC_PRIMARY_SELECTION);
                const char *clip_header = "<EDL VERSION=";
                if( !strncmp(clip_header, string, strlen(clip_header)) ) {
                        FileXML file;