projects
/
goodguy
/
history.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
label edit deadlock, build openexr cfg option, code cleanup
[goodguy/history.git]
/
cinelerra-5.1
/
cinelerra
/
awindowgui.C
diff --git
a/cinelerra-5.1/cinelerra/awindowgui.C
b/cinelerra-5.1/cinelerra/awindowgui.C
index 049be4e800db38161dae1d66956334e51dec23fe..039e8400f93a885f4e368a19803791c46ffb9801 100644
(file)
--- a/
cinelerra-5.1/cinelerra/awindowgui.C
+++ b/
cinelerra-5.1/cinelerra/awindowgui.C
@@
-279,7
+279,11
@@
void AssetPicon::create_objects()
asset->width, asset->height,
BC_RGB888, -1);
}
asset->width, asset->height,
BC_RGB888, -1);
}
-
+ { char string[BCTEXTLEN];
+ sprintf(string, _("Reading %s"), name);
+ mwindow->gui->lock_window("AssetPicon::create_objects");
+ mwindow->gui->show_message(string);
+ mwindow->gui->unlock_window(); }
file->read_frame(gui->temp_picon);
if( debug ) printf("AssetPicon::create_objects %d\n", __LINE__);
mwindow->video_cache->check_in(asset);
file->read_frame(gui->temp_picon);
if( debug ) printf("AssetPicon::create_objects %d\n", __LINE__);
mwindow->video_cache->check_in(asset);
@@
-1068,7
+1072,9
@@
void AWindowGUI::update_asset_list()
}
}
}
}
-
+ mwindow->gui->lock_window("AWindowGUI::update_asset_list");
+ mwindow->gui->default_message();
+ mwindow->gui->unlock_window();
//printf("AWindowGUI::update_asset_list %d\n", __LINE__);
//printf("AWindowGUI::update_asset_list %d\n", __LINE__);
@@
-1867,7
+1873,9
@@
AWindowInfo::AWindowInfo(MWindow *mwindow, AWindowGUI *gui, int x, int y)
int AWindowInfo::handle_event()
{
int AWindowInfo::handle_event()
{
- gui->awindow->asset_edit->edit_asset(gui->selected_asset());
+ int cur_x, cur_y;
+ gui->get_abs_cursor_xy(cur_x, cur_y, 0);
+ gui->awindow->asset_edit->edit_asset(gui->selected_asset(), cur_x, cur_y);
return 1;
}
return 1;
}
@@
-2021,15
+2029,15
@@
int AVIconDrawing::handle_event()
}
}
-AWindowListFormat::AWindowListFormat(MWindow *mwindow)
+AWindowListFormat::AWindowListFormat(MWindow *mwindow
, AWindowGUI *gui
)
: BC_MenuItem("")
{
this->mwindow = mwindow;
: BC_MenuItem("")
{
this->mwindow = mwindow;
+ this->gui = gui;
}
int AWindowListFormat::handle_event()
{
}
int AWindowListFormat::handle_event()
{
- AWindowGUI *gui = mwindow->awindow->gui;
gui->stop_vicon_drawing();
EDLSession *session = mwindow->edl->session;
gui->stop_vicon_drawing();
EDLSession *session = mwindow->edl->session;
@@
-2057,15
+2065,15
@@
void AWindowListFormat::update()
(char*)_("Display icons") : (char*)_("Display text"));
}
(char*)_("Display icons") : (char*)_("Display text"));
}
-AWindowListSort::AWindowListSort(MWindow *mwindow)
+AWindowListSort::AWindowListSort(MWindow *mwindow
, AWindowGUI *gui
)
: BC_MenuItem(_("Sort items"))
{
this->mwindow = mwindow;
: BC_MenuItem(_("Sort items"))
{
this->mwindow = mwindow;
+ this->gui = gui;
}
int AWindowListSort::handle_event()
{
}
int AWindowListSort::handle_event()
{
- AWindowGUI *gui = mwindow->awindow->gui;
gui->sort_assets();
return 1;
}
gui->sort_assets();
return 1;
}