N_("Proxy"),
};
+const char *AVIconDrawing::avicon_names[] =
+{
+ N_("Full Play"),
+ N_("Mouse Over"),
+ N_("Src Target"),
+ N_("No Play"),
+};
AssetVIcon::AssetVIcon(AssetPicon *picon, int w, int h, double framerate, int64_t length)
: VIcon(w, h, framerate), Garbage("AssetVIcon")
{
if( running() ) return;
interrupted = 0;
- audio_pos = 0;
+ double pos = vicon->length > 0 ? (double)vicon->seq_no/vicon->length : 0;
+ int audio_len = vicon->audio_size/sizeof(vicon_audio_t);
+ audio_pos = pos * audio_len;
this->vicon = vicon;
Thread::start();
}
void AssetVIcon::stop_audio()
{
- if( playing_audio > 0 )
+ if( playing_audio > 0 ) {
picon->gui->vicon_audio->stop(0);
- playing_audio = 0;
+ playing_audio = 0;
+ }
}
AssetViewPopup::AssetViewPopup(VIconThread *vt, int draw_mode,
{
}
+int AssetViewPopup::reposition_window(int x, int y, int w, int h)
+{
+ this->bar_h = (VIEW_POPUP_BAR_H * h) / 200;
+ return ViewPopup::reposition_window(x, y, w, h);
+}
+
int AssetViewPopup::button_press_event()
{
if( !is_event_win() ) return 0;
AssetVIconThread *avt = (AssetVIconThread *)vt;
if( !avt->vicon ) return 0;
- int dir = 1, button = get_buttonpress();
- switch( button ) {
- case WHEEL_DOWN: dir = -1; // fall thru
- case WHEEL_UP: return zoom_scale(dir);
+ int dir = 1;
+ switch( get_buttonpress() ) {
case LEFT_BUTTON:
break;
+ case MIDDLE_BUTTON:
+ avt->set_view_popup(0);
+ return 1;
+ case WHEEL_DOWN:
+ dir = -1; // fall thru
+ case WHEEL_UP:
+ switch( draw_mode ) {
+ case ASSET_VIEW_MEDIA:
+ case ASSET_VIEW_MEDIA_MAP:
+ avt->zoom_scale(dir);
+ return 1;
+ } // fall thru
default:
return 0;
}
- if( draw_mode != ASSET_VIEW_MEDIA_MAP ) return 0;
int x = get_cursor_x(), y = get_cursor_y();
AssetVIcon *vicon = (AssetVIcon *)avt->vicon;
AssetPicon *picon = vicon->picon;
MWindow *mwindow = picon->mwindow;
EDL *edl = mwindow->edl;
dragging = 0;
- if( y < bar_h ) {
+ if( y < get_h()/2 ) {
Indexable *idxbl =
picon->indexable ? picon->indexable :
picon->edl ? picon->edl : 0;
vedl->set_inpoint(start);
vedl->set_outpoint(end);
vedl->local_session->set_selectionstart(start);
- vedl->local_session->set_selectionend(end);
- vwindow->update_position(CHANGE_NONE, 0, 1, 0);
+ vedl->local_session->set_selectionend(start);
+ vwindow->gui->lock_window("AssetViewPopup::button_press_event");
+ vwindow->update_position();
+ vwindow->gui->unlock_window();
return 1;
}
- if( y >= get_h()-bar_h ) {
+ else {
dragging = 1;
if( !ctrl_down() && !shift_down() )
return cursor_motion_event();
}
}
mwindow->gui->lock_window("AssetVIcon::popup_button_press");
- mwindow->select_point(!ctrl_down() && !shift_down() ? pos : start);
+ mwindow->select_point(start);
edl->local_session->set_selectionstart(start);
edl->local_session->set_selectionend(!shift_down() ? start : end);
mwindow->zoom_sample(edl->local_session->zoom_sample);
int AssetViewPopup::cursor_motion_event()
{
- if( !is_event_win() ) return 0;
AssetVIconThread *avt = (AssetVIconThread *)vt;
- if( !avt->vicon || draw_mode != ASSET_VIEW_MEDIA_MAP ) return 0;
- if( !get_button_down() || get_buttonpress() != LEFT_BUTTON ||
- ctrl_down() || alt_down() || shift_down() )
- return 0;
AssetVIcon *vicon = (AssetVIcon *)avt->vicon;
- MWindow *mwindow = vicon->picon->mwindow;
- EDL *edl = mwindow->edl;
- if( dragging ) {
- int x = get_cursor_x();
- double total_length = edl->tracks->total_length();
- double pos = x * total_length / get_w();
- mwindow->gui->lock_window("AssetVIcon::popup_cursor_motion");
- mwindow->select_point(pos);
- mwindow->zoom_sample(edl->local_session->zoom_sample);
- mwindow->gui->unlock_window();
- return 1;
+ if( vicon && dragging && is_event_win() &&
+ get_button_down() && get_buttonpress() == LEFT_BUTTON &&
+ !ctrl_down() && !alt_down() && !shift_down() ) {
+ switch( draw_mode ) {
+ case ASSET_VIEW_MEDIA_MAP:
+ case ASSET_VIEW_FULL:
+ MWindow *mwindow = vicon->picon->mwindow;
+ EDL *edl = mwindow->edl;
+ int x = get_cursor_x();
+ double total_length = edl->tracks->total_length();
+ double pos = x * total_length / get_w();
+ mwindow->gui->lock_window("AssetVIcon::popup_cursor_motion");
+ mwindow->select_point(pos);
+ mwindow->zoom_sample(edl->local_session->zoom_sample);
+ mwindow->gui->unlock_window();
+ return 1;
+ }
}
return 0;
}
default:
return;
case ASSET_VIEW_MEDIA_MAP:
+ case ASSET_VIEW_FULL:
break;
}
set_color(BLACK);
double total_length = edl->tracks->total_length();
if( !total_length ) total_length = 1;
for( Track *track=edl->tracks->first; track!=0; track=track->next ) {
+ if( !track->record ) continue;
for( Edit *edit=track->edits->first; edit!=0; edit=edit->next ) {
Indexable *indexable = (Indexable *)edit->asset;
if( !indexable ) indexable = (Indexable *)edit->nested_edl;
}
}
+int AssetViewPopup::keypress_event()
+{
+ int result = 0;
+ AssetVIconThread *avt = (AssetVIconThread *)vt;
+ switch( avt->draw_mode ) {
+ case ASSET_VIEW_MEDIA_MAP:
+ switch( get_keypress() ) {
+ case 'f':
+ case 'F':
+ avt->draw_mode = ASSET_VIEW_FULL;
+ result = 1;
+ }
+ break;
+ case ASSET_VIEW_FULL:
+ avt->draw_mode = ASSET_VIEW_MEDIA_MAP;
+ result = 1;
+ }
+ if( result ) // zero change for refresh
+ avt->zoom_scale(0);
+ return ViewPopup::keypress_event();
+}
+
AssetVIconThread::AssetVIconThread(AWindowGUI *gui, Preferences *preferences)
: VIconThread(gui->asset_list, preferences->vicon_size * 16/9, preferences->vicon_size,
case VICON_COLOR_MODE_HIGH: vicon_cmodel = BC_RGB888; break;
}
this->vicon_cmodel = vicon_cmodel;
+ this->draw_lock = new Mutex("AssetVIconThread::draw_lock");
}
AssetVIconThread::~AssetVIconThread()
{
+ delete draw_lock;
+}
+
+void AssetVIconThread::drawing_started()
+{
+ draw_lock->lock("AssetVIconThread::drawing_started");
+}
+
+void AssetVIconThread::drawing_stopped()
+{
+ draw_lock->unlock();
}
void AssetVIconThread::set_view_popup(AssetVIcon *v, int draw_mode)
{
gui->stop_vicon_drawing();
- int mode = !v ? ASSET_VIEW_NONE :
- draw_mode >= 0 ? draw_mode :
- this->draw_mode;
- this->vicon = v;
- this->draw_mode = mode;
+ this->draw_mode = draw_mode;
+ set_view_popup(v);
gui->start_vicon_drawing();
}
-ViewPopup *AssetVIconThread::new_view_window()
+void AssetVIconThread::set_view_popup(AssetVIcon *v)
+{
+ if( !v ) draw_mode = ASSET_VIEW_NONE;
+ VIconThread::set_view_popup(v);
+}
+
+ViewPopup *AssetVIconThread::new_view_window(ViewPopup *vpopup)
{
BC_WindowBase *parent = wdw->get_parent();
- XineramaScreenInfo *info = parent->get_xinerama_info(-1);
- int cx = info ? info->x_org + info->width/2 : parent->get_root_w(0)/2;
- int cy = info ? info->y_org + info->height/2 : parent->get_root_h(0)/2;
- int vx = viewing->get_vx(), rx = 0;
- int vy = viewing->get_vy(), ry = 0;
- wdw->get_root_coordinates(vx, vy, &rx, &ry);
- rx += (rx >= cx ? -view_w+viewing->w/4 : viewing->w-viewing->w/4);
- ry += (ry >= cy ? -view_h+viewing->h/4 : viewing->h-viewing->h/4);
- AssetViewPopup *popup = new AssetViewPopup(this, draw_mode,
- rx, ry, view_w, view_h);
- if( draw_mode == ASSET_VIEW_MEDIA_MAP )
- vicon->playing_audio = -1;
- wdw->set_active_subwindow(popup);
- return popup;
+ int rx = 0, ry = 0, rw = 0, rh = 0;
+ if( draw_mode != ASSET_VIEW_FULL ) {
+ XineramaScreenInfo *info = parent->get_xinerama_info(-1);
+ int cx = info ? info->x_org + info->width/2 : parent->get_root_w(0)/2;
+ int cy = info ? info->y_org + info->height/2 : parent->get_root_h(0)/2;
+ int vx = viewing->get_vx(), vy = viewing->get_vy();
+ wdw->get_root_coordinates(vx, vy, &rx, &ry);
+ rx += (rx >= cx ? -view_w+viewing->w/4 : viewing->w-viewing->w/4);
+ ry += (ry >= cy ? -view_h+viewing->h/4 : viewing->h-viewing->h/4);
+ rw = view_w; rh = view_h;
+ }
+ else
+ parent->get_fullscreen_geometry(rx, ry, rw, rh);
+ AssetViewPopup *av_popup = (AssetViewPopup *)vpopup;
+ if( av_popup )
+ av_popup->reposition_window(rx, ry, rw, rh);
+ else
+ av_popup = new AssetViewPopup(this, draw_mode, rx, ry, rw, rh);
+ int playing_audio = gui->play_off ? -1 : 0;
+ if( !playing_audio ) {
+ switch( draw_mode ) {
+ case ASSET_VIEW_NONE:
+ case ASSET_VIEW_ICON:
+ case ASSET_VIEW_MEDIA_MAP:
+ case ASSET_VIEW_FULL:
+ playing_audio = -1;
+ break;
+ case ASSET_VIEW_MEDIA:
+ switch( gui->vicon_drawing ) {
+ case AVICON_SRC_TARGET:
+ case AVICON_NO_PLAY:
+ playing_audio = -1;
+ break;
+ }
+ }
+ }
+ vicon->playing_audio = playing_audio;
+ wdw->set_active_subwindow(av_popup);
+ return av_popup;
+}
+
+void AssetVIconThread::close_view_popup()
+{
+ stop_drawing();
+ drawing_started(); // waits for draw lock
+ drawing_stopped();
}
video_vframe = 0; video_icon = 0;
label_vframe = 0; label_icon = 0;
- atransition_vframe = 0; atransition_icon = 0;
- vtransition_vframe = 0; vtransition_icon = 0;
- aeffect_vframe = 0; aeffect_icon = 0;
- ladspa_vframe = 0; ladspa_icon = 0;
- veffect_vframe = 0; veffect_icon = 0;
- ff_aud_vframe = 0; ff_aud_icon = 0;
- ff_vid_vframe = 0; ff_vid_icon = 0;
-
aeffect_folder_vframe = 0; aeffect_folder_icon = 0;
atransition_folder_vframe = 0; atransition_folder_icon = 0;
clip_folder_vframe = 0; clip_folder_icon = 0;
remove_plugin = 0;
vicon_thread = 0;
vicon_audio = 0;
- vicon_drawing = 1;
+ vicon_drawing = AVICON_FULL_PLAY;
+ play_off = 0;
displayed_folder = AW_NO_FOLDER;
new_folder_thread = 0;
modify_folder_thread = 0;
int fx = mwindow->theme->afolders_x, fy = mwindow->theme->afolders_y;
int fw = mwindow->theme->afolders_w, fh = mwindow->theme->afolders_h;
- VFrame **images = mwindow->theme->get_image_set("playpatch_data");
- AVIconDrawing::calculate_geometry(this, images, &avicon_w, &avicon_h);
- add_subwindow(avicon_drawing = new AVIconDrawing(this, fw-avicon_w, fy, images));
+ int n = sizeof(AVIconDrawing::avicon_names)/sizeof(AVIconDrawing::avicon_names[0]);
+ int tw = 0; const char **av_names = AVIconDrawing::avicon_names;
+ for( int i=0; i<n; ++i ) {
+ int nw = get_text_width(MEDIUMFONT, _(av_names[i]));
+ if( tw < nw ) tw = nw;
+ }
+ int pw = BC_PopupMenu::calculate_w(4, tw, -1) + 16;
+ const char *text = _(AVIconDrawing::avicon_names[vicon_drawing]);
+ add_subwindow(avicon_drawing = new AVIconDrawing(this, fw, fy, pw, text));
+ avicon_drawing->create_objects();
add_subwindow(add_tools = new AddTools(mwindow, this, fx, fy, _("Visibility")));
add_tools->create_objects();
fy += add_tools->get_h(); fh -= add_tools->get_h();
int fx = mwindow->theme->afolders_x, fy = mwindow->theme->afolders_y;
int fw = mwindow->theme->afolders_w, fh = mwindow->theme->afolders_h;
add_tools->resize_event(fw-avicon_w, add_tools->get_h());
- avicon_drawing->reposition_window(fw-avicon_w, fy);
+ avicon_drawing->reposition_window(fw-avicon_drawing->get_w(), fy);
fy += add_tools->get_h(); fh -= add_tools->get_h();
folder_list->reposition_window(fx, fy, fw, fh);
}
return 1;
}
-void AWindowGUI::start_vicon_drawing()
+int AWindowGUI::start_vicon_drawing()
{
- if( !vicon_drawing || !vicon_thread->interrupted ) return;
+ if( play_off ) return stop_vicon_drawing();
+ if( !vicon_thread->interrupted ) return 1;
+ switch( vicon_drawing ) {
+ case AVICON_FULL_PLAY: // all vicons, viewing, target
+ break;
+ case AVICON_MOUSE_OVER: // one vicon, viewing, target
+ if( vicon_thread->solo ) break;
+ // fall thru
+ case AVICON_SRC_TARGET: // no vicons, no view, target
+ case AVICON_NO_PLAY: // no vicons, no view, no target
+ return 0;
+ }
if( mwindow->edl->session->awindow_folder == AW_MEDIA_FOLDER ||
mwindow->edl->session->awindow_folder == AW_PROXY_FOLDER ||
mwindow->edl->session->awindow_folder == AW_CLIP_FOLDER ||
break;
}
}
+ return 1;
+}
+
+int AWindowGUI::stop_vicon_drawing()
+{
+ if( !vicon_thread->interrupted )
+ vicon_thread->stop_drawing();
+ return 0;
}
-void AWindowGUI::stop_vicon_drawing()
+void AWindowGUI::close_view_popup()
{
- if( vicon_thread->interrupted ) return;
- vicon_thread->stop_drawing();
+ vicon_thread->close_view_popup();
}
VFrame *AssetPicon::get_vicon_frame()
case WHEEL_UP: {
int x = get_cursor_x(), y = get_cursor_y();
if( avt->cursor_inside(x, y) && avt->view_win )
- return avt->view_win->zoom_scale(dir);
+ avt->zoom_scale(dir);
return 1; }
}
}
deactivate_selection();
}
- else if( gui->vicon_drawing && get_button_down() &&
- (item = (AssetPicon*)get_selection(0, 0)) != 0 ) {
- switch( folder ) {
- case AW_MEDIA_FOLDER:
- case AW_PROXY_FOLDER:
- case AWINDOW_USER_FOLDERS:
- if( get_buttonpress() == LEFT_BUTTON ||
- get_buttonpress() == MIDDLE_BUTTON ) {
- AssetVIcon *vicon = 0;
- if( !gui->vicon_thread->vicon )
- vicon = item->vicon;
- int draw_mode = vicon && get_buttonpress() == MIDDLE_BUTTON ?
- ASSET_VIEW_MEDIA_MAP : ASSET_VIEW_MEDIA;
- gui->vicon_thread->set_view_popup(vicon, draw_mode);
- }
- break;
- case AW_CLIP_FOLDER:
- if( get_buttonpress() == LEFT_BUTTON ) {
- AssetVIcon *vicon = 0;
- if( !gui->vicon_thread->vicon )
- vicon = item->vicon;
- gui->vicon_thread->set_view_popup(vicon, ASSET_VIEW_ICON);
+ else if( get_button_down() && !gui->play_off &&
+ mwindow->edl->session->assetlist_format != ASSETS_TEXT ) {
+ item = (AssetPicon*)get_selection(0, 0);
+ if( item && !get_selection(0, 1) ) {
+ switch( folder ) {
+ case AW_MEDIA_FOLDER:
+ case AW_PROXY_FOLDER:
+ case AWINDOW_USER_FOLDERS:
+ if( get_buttonpress() == LEFT_BUTTON ||
+ get_buttonpress() == MIDDLE_BUTTON ) {
+ AssetVIcon *vicon = 0;
+ AssetVIconThread *avt = gui->vicon_thread;
+ if( !avt->vicon && gui->vicon_drawing != AVICON_NO_PLAY )
+ vicon = item->vicon;
+ int draw_mode = !vicon ?
+ ASSET_VIEW_NONE :
+ get_buttonpress() == MIDDLE_BUTTON ?
+ ASSET_VIEW_MEDIA_MAP : ASSET_VIEW_MEDIA;
+ avt->set_view_popup(vicon, draw_mode);
+ }
+ break;
+ case AW_CLIP_FOLDER:
+ if( get_buttonpress() == LEFT_BUTTON ) {
+ AssetVIcon *vicon = 0;
+ if( !gui->vicon_thread->vicon )
+ vicon = item->vicon;
+ gui->vicon_thread->set_view_popup(vicon, ASSET_VIEW_ICON);
+ }
+ break;
}
- break;
+ }
+ else {
+ gui->vicon_thread->set_view_popup(0);
+ if( gui->vicon_drawing != AVICON_FULL_PLAY )
+ gui->stop_vicon_drawing();
}
}
return 1;
int AWindowAssets::drag_start_event()
{
+ gui->vicon_thread->set_view_popup(0);
int collect_pluginservers = 0;
int collect_assets = 0, proxy = 0;
return 1;
}
-int AWindowAssets::focus_in_event()
+int AWindowAssets::cursor_enter_event()
{
- int ret = BC_ListBox::focus_in_event();
- gui->start_vicon_drawing();
+ int ret = BC_ListBox::cursor_enter_event();
+ switch( gui->vicon_drawing ) {
+ case AVICON_FULL_PLAY:
+ gui->start_vicon_drawing();
+ break;
+ case AVICON_MOUSE_OVER:
+ case AVICON_SRC_TARGET:
+ case AVICON_NO_PLAY:
+ default:
+ break;
+ }
return ret;
}
+int AWindowAssets::cursor_leave_event()
+{
+ if( !is_event_win() ) return 0;
+ if( !gui->vicon_thread->viewing )
+ gui->stop_vicon_drawing();
+ return BC_ListBox::cursor_leave_event();
+}
+
int AWindowAssets::focus_out_event()
{
gui->stop_vicon_drawing();
+ gui->vicon_thread->set_view_popup(0);
return BC_ListBox::focus_out_event();
}
int AWindowAssets::mouse_over_event(int no)
{
- if( gui->vicon_thread->viewing &&
- no >= 0 && no < gui->displayed_assets[0].size() ) {
- AssetPicon *picon = (AssetPicon *)gui->displayed_assets[0][no];
- gui->vicon_thread->set_view_popup(picon->vicon);
+ AssetPicon *picon = no >= 0 && no < gui->displayed_assets[0].size() ?
+ (AssetPicon *)gui->displayed_assets[0][no] : 0;
+ AssetVIcon *vicon = !picon ? 0 : picon->vicon;
+ switch( gui->vicon_drawing ) {
+ case AVICON_FULL_PLAY:
+ gui->vicon_thread->solo = 0;
+ if( vicon && gui->vicon_thread->viewing )
+ gui->vicon_thread->set_view_popup(vicon);
+ break;
+ case AVICON_MOUSE_OVER:
+ if( !vicon ) break;
+ gui->vicon_thread->solo = vicon;
+ gui->start_vicon_drawing();
+ // fall thru
+ case AVICON_SRC_TARGET:
+ if( !vicon ) break;
+ if( gui->vicon_thread->viewing )
+ gui->vicon_thread->set_view_popup(vicon);
+ break;
+ case AVICON_NO_PLAY:
+ default:
+ break;
}
return 0;
}
}
AddTools::AddTools(MWindow *mwindow, AWindowGUI *gui, int x, int y, const char *title)
- : BC_PopupMenu(x, y, BC_Title::calculate_w(gui, title, MEDIUMFONT)+8, title, -1, 0, 4)
+ : BC_PopupMenu(x, y, title, -1, 0)
{
this->mwindow = mwindow;
this->gui = gui;
return 1;
}
-AVIconDrawing::AVIconDrawing(AWindowGUI *agui, int x, int y, VFrame **images)
- : BC_Toggle(x, y, images, agui->vicon_drawing)
+AVIconDrawingItem::AVIconDrawingItem(AVIconDrawing *avicon, const char *text, int id)
+ : BC_MenuItem(text)
{
- this->agui = agui;
- set_tooltip(_("Preview"));
+ this->avicon = avicon;
+ this->id = id;
+}
+
+int AVIconDrawingItem::handle_event()
+{
+ for( int i=0; i<AVICON_PLAY_MODES; ++i ) {
+ AVIconDrawingItem *item = (AVIconDrawingItem *) avicon->get_item(i);
+ item->set_checked(id == i);
+ }
+ AWindowGUI *agui = avicon->agui;
+ agui->play_off = 0;
+ avicon->set_text(get_text());
+ agui->stop_vicon_drawing();
+ agui->vicon_thread->set_view_popup(0);
+ agui->vicon_thread->solo = 0;
+ agui->vicon_drawing = id;
+ agui->start_vicon_drawing();
+ return 1;
+}
+
+int AVIconDrawing::draw_face(int dx, int color)
+{
+ int ret = BC_PopupMenu::draw_face(dx, color);
+ if( agui->play_off ) {
+ int lx = get_margin(), ly = get_h()/2;
+ draw_line(lx,ly, get_w()-2*lx,ly);
+ }
+ return ret;
}
-void AVIconDrawing::calculate_geometry(AWindowGUI *agui, VFrame **images, int *ww, int *hh)
+AVIconDrawing::AVIconDrawing(AWindowGUI *agui, int x, int y, int w, const char *text)
+ : BC_PopupMenu(x-w, y, w, text, -1, 0, 4)
{
- int text_line = -1, toggle_x = -1, toggle_y = -1;
- int text_x = -1, text_y = -1, text_w = -1, text_h = -1;
- BC_Toggle::calculate_extents(agui, images, 1,
- &text_line, ww, hh, &toggle_x, &toggle_y,
- &text_x, &text_y, &text_w, &text_h, "", MEDIUMFONT);
+ this->agui = agui;
}
AVIconDrawing::~AVIconDrawing()
{
}
-int AVIconDrawing::handle_event()
+void AVIconDrawing::create_objects()
{
- agui->vicon_drawing = get_value();
- if( agui->vicon_drawing )
- agui->start_vicon_drawing();
- else
- agui->stop_vicon_drawing();
- return 1;
+ AVIconDrawingItem *item;
+ for( int i=0; i<AVICON_PLAY_MODES; ++i ) {
+ add_item(item = new AVIconDrawingItem(this, avicon_names[i], i));
+ item->set_checked(agui->vicon_drawing == i);
+ }
}
+int AVIconDrawing::button_press_event()
+{
+ if( !is_event_win() ) return 0;
+ if( get_buttonpress() == MIDDLE_BUTTON ) {
+ agui->play_off = !agui->play_off ? 1 : 0;
+ draw_face(0, -1);
+ flash(1);
+ agui->start_vicon_drawing();
+ return 1;
+ }
+ return BC_PopupMenu::button_press_event();
+}
AWindowListFormat::AWindowListFormat(MWindow *mwindow, AWindowGUI *gui)
: BC_MenuItem("","v",'v')
projects / goodguy / cinelerra.git / blobdiff