From: Good Guy Date: Mon, 19 Oct 2020 23:27:44 +0000 (-0600) Subject: dblclk label folder item is goto, fix no-drag trns if not drawn, amp up pane divider... X-Git-Tag: 2020-10~6 X-Git-Url: https://git.cinelerra-gg.org/git/?p=goodguy%2Fcinelerra.git;a=commitdiff_plain;h=b384d47608e07b9f5b6ce5fe1d0d76d9bda38202;hp=81915b8dd7046fd88697e3a9cc1a11b891be62db dblclk label folder item is goto, fix no-drag trns if not drawn, amp up pane divider contrast, guard pane members, fix pixmap handling of split x/y, add/fix patchbay gang_master track --- diff --git a/cinelerra-5.1/cinelerra/awindowgui.C b/cinelerra-5.1/cinelerra/awindowgui.C index 3960340a..a9f71b18 100644 --- a/cinelerra-5.1/cinelerra/awindowgui.C +++ b/cinelerra-5.1/cinelerra/awindowgui.C @@ -2879,6 +2879,18 @@ int AWindowAssets::selection_changed() deactivate_selection(); } + else if( get_button_down() && get_buttonpress() == LEFT_BUTTON && + get_double_click() ) { + item = (AssetPicon*)get_selection(0, 0); + if( item ) { + switch( folder ) { + case AW_LABEL_FOLDER: + if( !item->label ) break; + mwindow->set_position(item->label->position); + break; + } + } + } else if( get_button_down() && !gui->play_off && mwindow->edl->session->assetlist_format != ASSETS_TEXT ) { item = (AssetPicon*)get_selection(0, 0); diff --git a/cinelerra-5.1/cinelerra/edit.C b/cinelerra-5.1/cinelerra/edit.C index f538a503..5fab82ea 100644 --- a/cinelerra-5.1/cinelerra/edit.C +++ b/cinelerra-5.1/cinelerra/edit.C @@ -236,7 +236,7 @@ void Edit::detach_transition() { delete transition; transition = 0; - if( edl->session->gang_tracks == GANG_NONE ) return; + if( edl->local_session->gang_tracks == GANG_NONE ) return; double pos = track->from_units(startproject); Track *current = edl->tracks->first; for( ; current; current=current->next ) { @@ -264,7 +264,7 @@ void Edit::set_selected(int v) { if( !group_id ) { if( v < 0 ) v = !is_selected ? 1 : 0; - int gang = edl->session->gang_tracks != GANG_NONE ? 1 : 0; + int gang = edl->local_session->gang_tracks != GANG_NONE ? 1 : 0; select_affected_edits(v, gang); } else diff --git a/cinelerra-5.1/cinelerra/editpanel.C b/cinelerra-5.1/cinelerra/editpanel.C index bf33acba..0a56e0fe 100644 --- a/cinelerra-5.1/cinelerra/editpanel.C +++ b/cinelerra-5.1/cinelerra/editpanel.C @@ -162,7 +162,7 @@ void EditPanel::update() mwindow->edl->session->vwindow_click2play ; click2play->set_value(value); } - if( gang_tracks ) gang_tracks->update(mwindow->edl->session->gang_tracks); + if( gang_tracks ) gang_tracks->update(mwindow->edl->local_session->gang_tracks); if( meters ) { if( is_cwindow() ) { meters->update(mwindow->edl->session->cwindow_meter); @@ -1338,7 +1338,7 @@ EditPanelGangTracks::EditPanelGangTracks(MWindow *mwindow, EditPanel *panel, { this->mwindow = mwindow; this->panel = panel; - int gang = mwindow->edl->session->gang_tracks; + int gang = mwindow->edl->local_session->gang_tracks; set_tooltip(_(gang_tips[gang])); } @@ -1353,7 +1353,7 @@ VFrame **EditPanelGangTracks::get_images(MWindow *mwindow) gang_images[GANG_NONE] = mwindow->theme->get_image_set("gang0"); gang_images[GANG_MEDIA] = mwindow->theme->get_image_set("gang1"); gang_images[GANG_CHANNELS] = mwindow->theme->get_image_set("gang2"); - int gang = mwindow->edl->session->gang_tracks; + int gang = mwindow->edl->local_session->gang_tracks; return gang_images[gang]; } @@ -1366,7 +1366,7 @@ void EditPanelGangTracks::update(int gang) int EditPanelGangTracks::handle_event() { - int gang = mwindow->edl->session->gang_tracks; + int gang = mwindow->edl->local_session->gang_tracks; if( !shift_down() ) { if( ++gang > GANG_MEDIA ) gang = GANG_NONE; } diff --git a/cinelerra-5.1/cinelerra/editpanel.h b/cinelerra-5.1/cinelerra/editpanel.h index 5a2bafe4..2f3b40ed 100644 --- a/cinelerra-5.1/cinelerra/editpanel.h +++ b/cinelerra-5.1/cinelerra/editpanel.h @@ -25,6 +25,7 @@ #include "bcdialog.h" #include "guicast.h" #include "editpanel.inc" +#include "localsession.inc" #include "meterpanel.inc" #include "mwindow.inc" #include "manualgoto.inc" diff --git a/cinelerra-5.1/cinelerra/edlsession.C b/cinelerra-5.1/cinelerra/edlsession.C index f3044f6d..35cd1977 100644 --- a/cinelerra-5.1/cinelerra/edlsession.C +++ b/cinelerra-5.1/cinelerra/edlsession.C @@ -128,7 +128,6 @@ EDLSession::EDLSession(EDL *edl) scrub_speed = 2.; show_assets = 1; show_titles = 1; - gang_tracks = GANG_NONE; si_useduration = 1; si_duration = 3; test_playback_edits = 1; @@ -323,7 +322,6 @@ int EDLSession::load_defaults(BC_Hash *defaults) show_assets = defaults->get("SHOW_ASSETS", 1); show_titles = defaults->get("SHOW_TITLES", 1); - gang_tracks = defaults->get("GANG_TRACKS", GANG_NONE); // test_playback_edits = defaults->get("TEST_PLAYBACK_EDITS", 1); time_format = defaults->get("TIME_FORMAT", TIME_HMSF); timecode_offset = defaults->get("TIMECODE_OFFSET", timecode_offset); @@ -462,7 +460,6 @@ int EDLSession::save_defaults(BC_Hash *defaults) defaults->update("SI_DURATION",si_duration); defaults->update("SHOW_ASSETS", show_assets); defaults->update("SHOW_TITLES", show_titles); - defaults->update("GANG_TRACKS", gang_tracks); // defaults->update("TEST_PLAYBACK_EDITS", test_playback_edits); defaults->update("TIME_FORMAT", time_format); defaults->update("TIMECODE_OFFSET", timecode_offset); @@ -647,7 +644,6 @@ int EDLSession::load_xml(FileXML *file, safe_regions = file->tag.get_property("SAFE_REGIONS", safe_regions); show_assets = file->tag.get_property("SHOW_ASSETS", 1); show_titles = file->tag.get_property("SHOW_TITLES", 1); - gang_tracks = file->tag.get_property("GANG_TRACKS", GANG_NONE); // test_playback_edits = file->tag.get_property("TEST_PLAYBACK_EDITS", test_playback_edits); time_format = file->tag.get_property("TIME_FORMAT", time_format); timecode_offset = file->tag.get_property("TIMECODE_OFFSET", timecode_offset); @@ -717,7 +713,6 @@ int EDLSession::save_xml(FileXML *file) file->tag.set_property("SAFE_REGIONS", safe_regions); file->tag.set_property("SHOW_ASSETS", show_assets); file->tag.set_property("SHOW_TITLES", show_titles); - file->tag.set_property("GANG_TRACKS", gang_tracks); file->tag.set_property("TEST_PLAYBACK_EDITS", test_playback_edits); file->tag.set_property("TIME_FORMAT", time_format); file->tag.set_property("TIMECODE_OFFSET", timecode_offset); @@ -894,7 +889,6 @@ int EDLSession::copy(EDLSession *session) si_duration = session->si_duration; show_assets = session->show_assets; show_titles = session->show_titles; - gang_tracks = session->gang_tracks; test_playback_edits = session->test_playback_edits; time_format = session->time_format; timecode_offset = session->timecode_offset; diff --git a/cinelerra-5.1/cinelerra/edlsession.h b/cinelerra-5.1/cinelerra/edlsession.h index fad4789a..b95b8672 100644 --- a/cinelerra-5.1/cinelerra/edlsession.h +++ b/cinelerra-5.1/cinelerra/edlsession.h @@ -202,7 +202,6 @@ public: int show_assets; // Show titles in resources int show_titles; - int gang_tracks; // Test for data before rendering a track int test_playback_edits; // Format to display times in diff --git a/cinelerra-5.1/cinelerra/edlsession.inc b/cinelerra-5.1/cinelerra/edlsession.inc index da9cac9c..6b4b5a05 100644 --- a/cinelerra-5.1/cinelerra/edlsession.inc +++ b/cinelerra-5.1/cinelerra/edlsession.inc @@ -24,10 +24,6 @@ #define INIT_ATRANSITION "Crossfade" #define INIT_VTRANSITION "Dissolve" -#define GANG_NONE 0 -#define GANG_CHANNELS 1 -#define GANG_MEDIA 2 -#define TOTAL_GANGS 3 class EDLSession; diff --git a/cinelerra-5.1/cinelerra/localsession.C b/cinelerra-5.1/cinelerra/localsession.C index 75001658..8293824c 100644 --- a/cinelerra-5.1/cinelerra/localsession.C +++ b/cinelerra-5.1/cinelerra/localsession.C @@ -76,6 +76,7 @@ LocalSession::LocalSession(EDL *edl) zoom_atrack = 0; zoom_vtrack = 0; x_pane = y_pane = -1; + gang_tracks = GANG_NONE; for(int i = 0; i < TOTAL_PANES; i++) { view_start[i] = 0; @@ -101,6 +102,7 @@ LocalSession::LocalSession(EDL *edl) red_max = green_max = blue_max = 0; use_max = 0; solo_track_id = -1; + gang_tracks = GANG_NONE; } LocalSession::~LocalSession() @@ -142,6 +144,7 @@ void LocalSession::copy_from(LocalSession *that) blue_max = that->blue_max; use_max = that->use_max; solo_track_id = that->solo_track_id; + gang_tracks = that->gang_tracks; for (int i = 0; i < AUTOGROUPTYPE_COUNT; i++) { automation_mins[i] = that->automation_mins[i]; @@ -196,6 +199,8 @@ void LocalSession::save_xml(FileXML *file, double start) file->tag.set_property("GREEN_MAX", green_max); file->tag.set_property("BLUE_MAX", blue_max); file->tag.set_property("USE_MAX", use_max); + file->tag.set_property("GANG_TRACKS", gang_tracks); + for (int i = 0; i < AUTOGROUPTYPE_COUNT; i++) { if (!Automation::autogrouptypes_fixedrange[i]) { @@ -234,6 +239,7 @@ void LocalSession::synchronize_params(LocalSession *that) blue_max = that->blue_max; if( solo_track_id < 0 || that->solo_track_id < 0 ) solo_track_id = that->solo_track_id; + gang_tracks = that->gang_tracks; } @@ -293,7 +299,7 @@ void LocalSession::load_xml(FileXML *file, unsigned long load_flags) green_max = file->tag.get_property("GREEN_MAX", green_max); blue_max = file->tag.get_property("BLUE_MAX", blue_max); use_max = file->tag.get_property("USE_MAX", use_max); - + gang_tracks = file->tag.get_property("GANG_TRACKS", gang_tracks); for (int i = 0; i < AUTOGROUPTYPE_COUNT; i++) { if (!Automation::autogrouptypes_fixedrange[i]) { automation_mins[i] = file->tag.get_property(xml_autogrouptypes_titlesmin[i],automation_mins[i]); @@ -360,6 +366,7 @@ int LocalSession::load_defaults(BC_Hash *defaults) green_max = defaults->get("GREEN_MAX", 0.0); blue_max = defaults->get("BLUE_MAX", 0.0); use_max = defaults->get("USE_MAX", 0); + gang_tracks = defaults->get("GANG_TRACKS", GANG_NONE); for (int i = 0; i < AUTOGROUPTYPE_COUNT; i++) { if (!Automation::autogrouptypes_fixedrange[i]) { @@ -397,6 +404,7 @@ int LocalSession::save_defaults(BC_Hash *defaults) defaults->update("GREEN_MAX", green_max); defaults->update("BLUE_MAX", blue_max); defaults->update("USE_MAX", use_max); + defaults->update("GANG_TRACKS", gang_tracks); for (int i = 0; i < AUTOGROUPTYPE_COUNT; i++) { if (!Automation::autogrouptypes_fixedrange[i]) { diff --git a/cinelerra-5.1/cinelerra/localsession.h b/cinelerra-5.1/cinelerra/localsession.h index 9b962456..3497d07e 100644 --- a/cinelerra-5.1/cinelerra/localsession.h +++ b/cinelerra-5.1/cinelerra/localsession.h @@ -116,6 +116,8 @@ public: int use_max; // mask solo track, or -1 int solo_track_id; +// gang mode: none, channels, media + int gang_tracks; private: // The reason why selection ranges and inpoints have to be separate: // The selection position has to change to set new in points. diff --git a/cinelerra-5.1/cinelerra/localsession.inc b/cinelerra-5.1/cinelerra/localsession.inc index e1960c1d..3f5bc9d1 100644 --- a/cinelerra-5.1/cinelerra/localsession.inc +++ b/cinelerra-5.1/cinelerra/localsession.inc @@ -24,4 +24,9 @@ class LocalSession; +#define GANG_NONE 0 +#define GANG_CHANNELS 1 +#define GANG_MEDIA 2 +#define TOTAL_GANGS 3 + #endif diff --git a/cinelerra-5.1/cinelerra/mainundo.C b/cinelerra-5.1/cinelerra/mainundo.C index c19a6ada..5b0a70bd 100644 --- a/cinelerra-5.1/cinelerra/mainundo.C +++ b/cinelerra-5.1/cinelerra/mainundo.C @@ -198,11 +198,9 @@ int MainUndo::undo() } if( current ) { // Set the redo text to the current description - if( mwindow->gui ) { - UndoStackItem *next = NEXT; - mwindow->gui->mainmenu->redo-> - update_caption(next ? next->get_description() : ""); - } + UndoStackItem *next = NEXT; + mwindow->gui->mainmenu->redo-> + update_caption(next ? next->get_description() : ""); char *current_data = current->get_data(); if( current_data ) { FileXML file; diff --git a/cinelerra-5.1/cinelerra/mwindow.C b/cinelerra-5.1/cinelerra/mwindow.C index cf16cd93..4179cc51 100644 --- a/cinelerra-5.1/cinelerra/mwindow.C +++ b/cinelerra-5.1/cinelerra/mwindow.C @@ -1524,7 +1524,8 @@ void MWindow::tile_mixers() void MWindow::set_gang_tracks(int v) { - edl->session->gang_tracks = v; + edl->local_session->gang_tracks = v; + sync_parameters(CHANGE_PARAMS); gui->update(1, 1, 0, 0, 1, 0, 0); gui->flush(); } diff --git a/cinelerra-5.1/cinelerra/mwindowedit.C b/cinelerra-5.1/cinelerra/mwindowedit.C index 6f74435b..66910d2a 100644 --- a/cinelerra-5.1/cinelerra/mwindowedit.C +++ b/cinelerra-5.1/cinelerra/mwindowedit.C @@ -779,7 +779,7 @@ void MWindow::insert_effects_canvas(Track *dest_track, double start, double leng ArrayList shared_locations; PluginSet *pluginset = session->pluginset_highlighted; - int gang = edl->session->gang_tracks != GANG_NONE ? 1 : 0; + int gang = edl->local_session->gang_tracks != GANG_NONE ? 1 : 0; int data_type = dest_track->data_type; int first_track = 1; diff --git a/cinelerra-5.1/cinelerra/mwindowgui.C b/cinelerra-5.1/cinelerra/mwindowgui.C index 17078ba4..5e4dc7bd 100644 --- a/cinelerra-5.1/cinelerra/mwindowgui.C +++ b/cinelerra-5.1/cinelerra/mwindowgui.C @@ -299,14 +299,14 @@ void MWindowGUI::redraw_time_dependancies() int MWindowGUI::focus_in_event() { for(int i = 0; i < TOTAL_PANES; i++) - if(pane[i]) pane[i]->cursor->focus_in_event(); + if(pane[i] && pane[i]->cursor) pane[i]->cursor->focus_in_event(); return 1; } int MWindowGUI::focus_out_event() { for(int i = 0; i < TOTAL_PANES; i++) - if(pane[i]) pane[i]->cursor->focus_out_event(); + if(pane[i] && pane[i]->cursor) pane[i]->cursor->focus_out_event(); return 1; } @@ -512,7 +512,7 @@ void MWindowGUI::deactivate_timeline() { for(int i = 0; i < TOTAL_PANES; i++) { - if(pane[i]) + if(pane[i] && pane[i]->canvas) { pane[i]->canvas->deactivate(); } @@ -534,7 +534,7 @@ void MWindowGUI::draw_overlays(int flash_it) { for(int i = 0; i < TOTAL_PANES; i++) { - if(pane[i]) + if(pane[i] && pane[i]->canvas) { pane[i]->canvas->draw_overlays(); if(flash_it) pane[i]->canvas->flash(); @@ -591,7 +591,7 @@ void MWindowGUI::update_plugintoggles() { for(int i = 0; i < TOTAL_PANES; i++) { - if(pane[i]) + if(pane[i] && pane[i]->canvas) { pane[i]->canvas->refresh_plugintoggles(); } @@ -603,7 +603,7 @@ void MWindowGUI::draw_indexes(Indexable *indexable) { for(int i = 0; i < TOTAL_PANES; i++) { - if(pane[i]) + if(pane[i] && pane[i]->canvas) { pane[i]->canvas->draw_indexes(indexable); } @@ -613,8 +613,11 @@ void MWindowGUI::draw_indexes(Indexable *indexable) void MWindowGUI::draw_canvas(int redraw, int hide_cursor) { resource_thread->stop_draw(0); - - int mode = redraw ? FORCE_REDRAW : NORMAL_DRAW; + int mode = NORMAL_DRAW; + if( redraw ) { + mode = FORCE_REDRAW; + resource_pixmaps.remove_all_objects(); + } for(int i = 0; i < TOTAL_PANES; i++) { if( pane[i] ) pane[i]->canvas->draw(mode, hide_cursor); @@ -627,7 +630,7 @@ void MWindowGUI::flash_canvas(int flush) { for(int i = 0; i < TOTAL_PANES; i++) { - if(pane[i]) + if(pane[i] && pane[i]->canvas) { pane[i]->canvas->flash(flush); } @@ -646,7 +649,7 @@ void MWindowGUI::draw_cursor(int do_plugintoggles) { for(int i = 0; i < TOTAL_PANES; i++) { - if(pane[i]) + if(pane[i] && pane[i]->cursor) { pane[i]->cursor->draw(do_plugintoggles); } @@ -657,7 +660,7 @@ void MWindowGUI::show_cursor(int do_plugintoggles) { for(int i = 0; i < TOTAL_PANES; i++) { - if(pane[i]) + if(pane[i] && pane[i]->cursor) { pane[i]->cursor->show(do_plugintoggles); } @@ -668,7 +671,7 @@ void MWindowGUI::hide_cursor(int do_plugintoggles) { for(int i = 0; i < TOTAL_PANES; i++) { - if(pane[i]) + if(pane[i] && pane[i]->cursor) { pane[i]->cursor->hide(do_plugintoggles); } @@ -679,7 +682,7 @@ void MWindowGUI::update_cursor() { for(int i = 0; i < TOTAL_PANES; i++) { - if(pane[i]) + if(pane[i] && pane[i]->cursor) { pane[i]->cursor->update(); } @@ -690,7 +693,7 @@ void MWindowGUI::set_playing_back(int value) { for(int i = 0; i < TOTAL_PANES; i++) { - if(pane[i]) + if(pane[i] && pane[i]->cursor) { pane[i]->cursor->playing_back = value; } @@ -746,7 +749,7 @@ void MWindowGUI::set_editing_mode(int flush) { for(int i = 0; i < TOTAL_PANES; i++) { - if(pane[i]) + if(pane[i] && pane[i]->canvas) { pane[i]->canvas->update_cursor(flush); } @@ -782,6 +785,9 @@ void MWindowGUI::update(int scrollbars, if( do_canvas != NO_DRAW && do_canvas != IGNORE_THREAD ) resource_thread->stop_draw(1); + if( do_canvas == FORCE_REDRAW ) + resource_pixmaps.remove_all_objects(); + for(int i = 0; i < TOTAL_PANES; i++) { if(pane[i]) pane[i]->update(scrollbars, @@ -882,11 +888,9 @@ int MWindowGUI::drag_motion() for(int i = 0; i < TOTAL_PANES; i++) { - if(pane[i]) pane[i]->canvas->drag_motion( - &over_track, - &over_edit, - &over_pluginset, - &over_plugin); + if(pane[i] && pane[i]->canvas) + pane[i]->canvas->drag_motion(&over_track, &over_edit, + &over_pluginset, &over_plugin); } if(mwindow->session->track_highlighted != over_track) @@ -943,8 +947,8 @@ int MWindowGUI::drag_stop() for(int i = 0; i < TOTAL_PANES; i++) { - if(pane[i]) result |= pane[i]->canvas->drag_stop( - &redraw); + if(pane[i] && pane[i]->canvas) + result |= pane[i]->canvas->drag_stop(&redraw); } mwindow->edl->optimize(); @@ -1048,7 +1052,8 @@ int MWindowGUI::repeat_event(int64_t duration) int result = 0; for(int i = 0; i < TOTAL_PANES; i++) { - if(pane[i]) result = pane[i]->cursor->repeat_event(duration); + if(pane[i] && pane[i]->cursor) + result = pane[i]->cursor->repeat_event(duration); } return result; } diff --git a/cinelerra-5.1/cinelerra/playabletracks.C b/cinelerra-5.1/cinelerra/playabletracks.C index cf98666b..4f53d22a 100644 --- a/cinelerra-5.1/cinelerra/playabletracks.C +++ b/cinelerra-5.1/cinelerra/playabletracks.C @@ -65,7 +65,7 @@ int PlayableTracks::is_playable(Track *current_track, int64_t position, result = 0; // Test play patch if( result && - !current_track->play ) + !current_track->plays() ) result = 0; if( result ) { EDL *edl = current_track->edl; diff --git a/cinelerra-5.1/cinelerra/resourcethread.C b/cinelerra-5.1/cinelerra/resourcethread.C index 4c28c032..fca02199 100644 --- a/cinelerra-5.1/cinelerra/resourcethread.C +++ b/cinelerra-5.1/cinelerra/resourcethread.C @@ -452,7 +452,8 @@ void ResourceVideoThread::do_video(VResourceThreadItem *item) item->pixmap->draw_vframe(temp_picon2, item->picon_x, item->picon_y, item->picon_w, item->picon_h, 0, 0); - gui->update(0, IGNORE_THREAD, 0, 0, 0, 0, 0); + TimelinePane *pane = gui->pane[item->pane_number]; + if( pane ) pane->update(0, IGNORE_THREAD, 0, 0); } } diff --git a/cinelerra-5.1/cinelerra/track.C b/cinelerra-5.1/cinelerra/track.C index f97ef3c2..03034830 100644 --- a/cinelerra-5.1/cinelerra/track.C +++ b/cinelerra-5.1/cinelerra/track.C @@ -1793,8 +1793,8 @@ void Track::set_camera(float x, float y, float z) int Track::is_hidden() { if( master ) return 0; - if( edl->session->gang_tracks == GANG_MEDIA ) return 1; - if( edl->session->gang_tracks == GANG_CHANNELS ) { + if( edl->local_session->gang_tracks == GANG_MEDIA ) return 1; + if( edl->local_session->gang_tracks == GANG_CHANNELS ) { for( Track *track=previous; track; track=track->previous ) { if( track->data_type == data_type ) return 1; if( track->master ) return 0; @@ -1806,13 +1806,13 @@ int Track::is_hidden() Track *Track::gang_master() { Track *track = this; - switch( edl->session->gang_tracks ) { + switch( edl->local_session->gang_tracks ) { case GANG_NONE: return track; case GANG_CHANNELS: { Track *current = track; int data_type = track->data_type; - while( current && !track->master ) { + while( current && !current->master ) { if( !(current = current->previous) ) break; if( current->data_type == data_type ) track = current; } @@ -1827,7 +1827,7 @@ Track *Track::gang_master() int Track::in_gang(Track *track) { - if( edl->session->gang_tracks == GANG_NONE ) return ganged; + if( edl->local_session->gang_tracks == GANG_NONE ) return ganged; Track *current = this; while( current && !current->master ) current = current->previous; while( track && !track->master ) track = track->previous; @@ -1846,7 +1846,7 @@ int Track::is_ganged() int Track::armed_gang(Track *track) { - if( edl->session->gang_tracks == GANG_NONE ) return ganged; + if( edl->local_session->gang_tracks == GANG_NONE ) return ganged; Track *current = gang_master(); for(;;) { if( track == current ) return 1; @@ -1856,6 +1856,10 @@ int Track::armed_gang(Track *track) return 1; } +int Track::plays() +{ + return gang_master()->play; +} int Track::index_in(Mixer *mixer) { diff --git a/cinelerra-5.1/cinelerra/track.h b/cinelerra-5.1/cinelerra/track.h index 9c12af1f..c267eb5b 100644 --- a/cinelerra-5.1/cinelerra/track.h +++ b/cinelerra-5.1/cinelerra/track.h @@ -176,6 +176,7 @@ public: int is_ganged(); int armed_gang(Track *track); int index_in(Mixer *mixer); + int plays(); EDL *edl; Tracks *tracks; diff --git a/cinelerra-5.1/cinelerra/trackcanvas.C b/cinelerra-5.1/cinelerra/trackcanvas.C index 536fabc6..c6722e79 100644 --- a/cinelerra-5.1/cinelerra/trackcanvas.C +++ b/cinelerra-5.1/cinelerra/trackcanvas.C @@ -805,14 +805,11 @@ void TrackCanvas::draw_resources(int mode, resource_timer->update(); + if(!indexes_only) { // Age resource pixmaps for deletion - if(!indexes_only) for(int i = 0; i < gui->resource_pixmaps.total; i++) gui->resource_pixmaps.values[i]->visible--; - - if(mode == FORCE_REDRAW) - gui->resource_pixmaps.remove_all_objects(); - + } if(debug) PRINT_TRACE if(mode != IGNORE_THREAD) gui->resource_thread->reset(pane->number, indexes_only); @@ -978,12 +975,9 @@ ResourcePixmap* TrackCanvas::create_pixmap(Edit *edit, if(!result) { //SET_TRACE - result = new ResourcePixmap(mwindow, - gui, - edit, - pane->number, - pixmap_w, - pixmap_h); + result = new ResourcePixmap(mwindow, gui, edit, pane->number, pixmap_w, pixmap_h); + set_bg_color(BLACK); + clear_box(0,0, pixmap_w,pixmap_h, result); //SET_TRACE gui->resource_pixmaps.append(result); } @@ -2240,7 +2234,8 @@ int TrackCanvas::do_keyframes(int cursor_x, // track context menu to appear int result = 0; EDLSession *session = mwindow->edl->session; - int gang = session->gang_tracks != GANG_NONE || get_double_click() ? 1 : 0; + int gang = mwindow->edl->local_session->gang_tracks != GANG_NONE || + get_double_click() ? 1 : 0; static BC_Pixmap *auto_pixmaps[AUTOMATION_TOTAL] = { @@ -5105,6 +5100,8 @@ int TrackCanvas::do_plugin_handles(int cursor_x, int TrackCanvas::do_transition_handles(int cursor_x, int cursor_y, int button_press, int &rerender, int &update_overlay, int &new_cursor, int &update_cursor) { + if( !mwindow->edl->session->auto_conf->transitions ) + return 0; Transition *trans_result = 0; int result = 0; diff --git a/cinelerra-5.1/cinelerra/tracks.C b/cinelerra-5.1/cinelerra/tracks.C index 8cbf92ce..862bde2d 100644 --- a/cinelerra-5.1/cinelerra/tracks.C +++ b/cinelerra-5.1/cinelerra/tracks.C @@ -333,7 +333,7 @@ int Tracks::delete_track(Track *track, int gang) { if( !track ) return 0; if( gang < 0 ) - gang = edl->session->gang_tracks != GANG_NONE ? 1 : 0; + gang = edl->local_session->gang_tracks != GANG_NONE ? 1 : 0; Track *nxt = track->next; if( gang ) { track = track->gang_master(); @@ -363,7 +363,7 @@ int Tracks::detach_shared_effects(int module) } int Tracks::detach_ganged_effects(Plugin *plugin) { - if( edl->session->gang_tracks == GANG_NONE ) return 1; + if( edl->local_session->gang_tracks == GANG_NONE ) return 1; for( Track *current=first; current; current=NEXT ) { if( current == plugin->track ) continue; if( !current->armed_gang(plugin->track) ) continue; @@ -385,7 +385,7 @@ int Tracks::total_of(int type) IntAuto *mute_auto = (IntAuto *)mute_keyframe; result += - (current->play && type == PLAY) || + (current->plays() && type == PLAY) || (current->is_armed() && type == RECORD) || (current->is_ganged() && type == GANG) || (current->draw && type == DRAW) || @@ -420,7 +420,7 @@ int Tracks::playable_audio_tracks() for(Track *current = first; current; current = NEXT) { - if(current->data_type == TRACK_AUDIO && current->play) + if(current->data_type == TRACK_AUDIO && current->plays()) { result++; } @@ -435,7 +435,7 @@ int Tracks::playable_video_tracks() for(Track *current = first; current; current = NEXT) { - if(current->data_type == TRACK_VIDEO && current->play) + if(current->data_type == TRACK_VIDEO && current->plays()) { result++; } @@ -464,7 +464,7 @@ double Tracks::total_playable_length() double total = 0; for(Track *current = first; current; current = NEXT) { - if( current->play ) + if( current->plays() ) { double length = current->get_length(); if(length > total) total = length; @@ -745,7 +745,7 @@ int Tracks::new_group(int id) int Tracks::set_group_selected(int id, int v) { int count = 0; - int gang = edl->session->gang_tracks != GANG_NONE ? 1 : 0; + int gang = edl->local_session->gang_tracks != GANG_NONE ? 1 : 0; for( Track *track=first; track; track=track->next ) { if( track->is_hidden() ) continue; for( Edit *edit=track->edits->first; edit; edit=edit->next ) { diff --git a/cinelerra-5.1/cinelerra/tracksedit.C b/cinelerra-5.1/cinelerra/tracksedit.C index 8a8602f6..e84fe07b 100644 --- a/cinelerra-5.1/cinelerra/tracksedit.C +++ b/cinelerra-5.1/cinelerra/tracksedit.C @@ -386,7 +386,7 @@ void Tracks::set_transition_length(Transition *transition, double length) } } if( !found ) return; - if( edl->session->gang_tracks == GANG_NONE ) return; + if( edl->local_session->gang_tracks == GANG_NONE ) return; Track *track = transition->edit->track; double pos = track->from_units(transition->edit->startproject); Track *current = edl->tracks->first; @@ -558,7 +558,7 @@ int Tracks::delete_tracks() { int total_deleted = 0; int done = 0; - int gang = edl->session->gang_tracks != GANG_NONE ? 1 : 0; + int gang = edl->local_session->gang_tracks != GANG_NONE ? 1 : 0; while( !done ) { done = 1; @@ -757,7 +757,7 @@ int Tracks::concatenate_tracks(int edit_plugins, int edit_autos) input_track = input_track->next) { if(input_track->data_type == data_type && - input_track->play && + input_track->plays() && !input_track->is_armed()) break; } @@ -783,7 +783,7 @@ int Tracks::concatenate_tracks(int edit_plugins, int edit_autos) if(input_track->data_type == data_type && !input_track->is_armed() && - input_track->play) break; + input_track->plays()) break; } for(output_track = output_track->next; @@ -856,7 +856,7 @@ int Tracks::roll_track_up(Track *track) if( first == last ) return 1; int n = 1; Track *src = track, *dst = src->previous; - if( edl->session->gang_tracks != GANG_NONE ) { + if( edl->local_session->gang_tracks != GANG_NONE ) { while( src && !src->master ) src = src->previous; if( !src ) src = first; Track *nxt = src->next; @@ -874,7 +874,7 @@ int Tracks::roll_track_down(Track *track) if( first == last ) return 1; int n = 1; Track *src = track, *dst = src->next; - if( edl->session->gang_tracks != GANG_NONE ) { + if( edl->local_session->gang_tracks != GANG_NONE ) { while( src && !src->master ) src = src->previous; if( !src ) src = first; Track *nxt = src->next; @@ -900,7 +900,7 @@ int Tracks::roll_tracks_up() if( first == last ) return 1; int n = 1; Track *src = first, *dst = 0; - if( edl->session->gang_tracks != GANG_NONE ) { + if( edl->local_session->gang_tracks != GANG_NONE ) { Track *nxt = src->next; while( nxt && !nxt->master ) { ++n; nxt = nxt->next; } } @@ -914,7 +914,7 @@ int Tracks::roll_tracks_down() if( first == last ) return 1; int n = 1; Track *src = last, *dst = first; - if( edl->session->gang_tracks != GANG_NONE ) { + if( edl->local_session->gang_tracks != GANG_NONE ) { while( src && !src->master ) { ++n; src = src->previous; } } if( src == dst ) return 1; @@ -1108,7 +1108,7 @@ void Tracks::paste_automation(double selectionstart, void Tracks::paste_transition(PluginServer *server, Edit *dest_edit) { dest_edit->insert_transition(server->title); - if( edl->session->gang_tracks == GANG_NONE ) return; + if( edl->local_session->gang_tracks == GANG_NONE ) return; Track *track = dest_edit->track; double pos = track->from_units(dest_edit->startproject); for( Track *current=first; current; current=current->next ) { diff --git a/cinelerra-5.1/doc/shortcuts.html b/cinelerra-5.1/doc/shortcuts.html index 57abd089..6f3ec8a4 100644 --- a/cinelerra-5.1/doc/shortcuts.html +++ b/cinelerra-5.1/doc/shortcuts.html @@ -2856,6 +2856,12 @@ 'Ctrl+Shift' Use window layout #4 + +
+ In Labels folder + Double click + On a Label, timeline cursor moves to label +

diff --git a/cinelerra-5.1/plugins/theme_blond/data/xpane_dn.png b/cinelerra-5.1/plugins/theme_blond/data/xpane_dn.png index 80a7337f..d3f2d9ec 100644 Binary files a/cinelerra-5.1/plugins/theme_blond/data/xpane_dn.png and b/cinelerra-5.1/plugins/theme_blond/data/xpane_dn.png differ diff --git a/cinelerra-5.1/plugins/theme_blond/data/xpane_hi.png b/cinelerra-5.1/plugins/theme_blond/data/xpane_hi.png index 436c0803..14ca7784 100644 Binary files a/cinelerra-5.1/plugins/theme_blond/data/xpane_hi.png and b/cinelerra-5.1/plugins/theme_blond/data/xpane_hi.png differ diff --git a/cinelerra-5.1/plugins/theme_blond/data/xpane_up.png b/cinelerra-5.1/plugins/theme_blond/data/xpane_up.png index 007cf7a0..8f70e433 100644 Binary files a/cinelerra-5.1/plugins/theme_blond/data/xpane_up.png and b/cinelerra-5.1/plugins/theme_blond/data/xpane_up.png differ diff --git a/cinelerra-5.1/plugins/theme_blond/data/ypane_dn.png b/cinelerra-5.1/plugins/theme_blond/data/ypane_dn.png index 2f7c4dee..2449be14 100644 Binary files a/cinelerra-5.1/plugins/theme_blond/data/ypane_dn.png and b/cinelerra-5.1/plugins/theme_blond/data/ypane_dn.png differ diff --git a/cinelerra-5.1/plugins/theme_blond/data/ypane_hi.png b/cinelerra-5.1/plugins/theme_blond/data/ypane_hi.png index dff6eae9..9efae065 100644 Binary files a/cinelerra-5.1/plugins/theme_blond/data/ypane_hi.png and b/cinelerra-5.1/plugins/theme_blond/data/ypane_hi.png differ diff --git a/cinelerra-5.1/plugins/theme_blond/data/ypane_up.png b/cinelerra-5.1/plugins/theme_blond/data/ypane_up.png index 321bf0c8..4ad7b4e1 100644 Binary files a/cinelerra-5.1/plugins/theme_blond/data/ypane_up.png and b/cinelerra-5.1/plugins/theme_blond/data/ypane_up.png differ diff --git a/cinelerra-5.1/plugins/theme_blond_cv/data/xpane_dn.png b/cinelerra-5.1/plugins/theme_blond_cv/data/xpane_dn.png index 80a7337f..d3f2d9ec 100644 Binary files a/cinelerra-5.1/plugins/theme_blond_cv/data/xpane_dn.png and b/cinelerra-5.1/plugins/theme_blond_cv/data/xpane_dn.png differ diff --git a/cinelerra-5.1/plugins/theme_blond_cv/data/xpane_hi.png b/cinelerra-5.1/plugins/theme_blond_cv/data/xpane_hi.png index 436c0803..14ca7784 100644 Binary files a/cinelerra-5.1/plugins/theme_blond_cv/data/xpane_hi.png and b/cinelerra-5.1/plugins/theme_blond_cv/data/xpane_hi.png differ diff --git a/cinelerra-5.1/plugins/theme_blond_cv/data/xpane_up.png b/cinelerra-5.1/plugins/theme_blond_cv/data/xpane_up.png index 007cf7a0..8f70e433 100644 Binary files a/cinelerra-5.1/plugins/theme_blond_cv/data/xpane_up.png and b/cinelerra-5.1/plugins/theme_blond_cv/data/xpane_up.png differ diff --git a/cinelerra-5.1/plugins/theme_blond_cv/data/ypane_dn.png b/cinelerra-5.1/plugins/theme_blond_cv/data/ypane_dn.png index 2f7c4dee..2449be14 100644 Binary files a/cinelerra-5.1/plugins/theme_blond_cv/data/ypane_dn.png and b/cinelerra-5.1/plugins/theme_blond_cv/data/ypane_dn.png differ diff --git a/cinelerra-5.1/plugins/theme_blond_cv/data/ypane_hi.png b/cinelerra-5.1/plugins/theme_blond_cv/data/ypane_hi.png index dff6eae9..9efae065 100644 Binary files a/cinelerra-5.1/plugins/theme_blond_cv/data/ypane_hi.png and b/cinelerra-5.1/plugins/theme_blond_cv/data/ypane_hi.png differ diff --git a/cinelerra-5.1/plugins/theme_blond_cv/data/ypane_up.png b/cinelerra-5.1/plugins/theme_blond_cv/data/ypane_up.png index 321bf0c8..4ad7b4e1 100644 Binary files a/cinelerra-5.1/plugins/theme_blond_cv/data/ypane_up.png and b/cinelerra-5.1/plugins/theme_blond_cv/data/ypane_up.png differ diff --git a/cinelerra-5.1/plugins/theme_blue/data/xpane_dn.png b/cinelerra-5.1/plugins/theme_blue/data/xpane_dn.png index 80a7337f..d3f2d9ec 100644 Binary files a/cinelerra-5.1/plugins/theme_blue/data/xpane_dn.png and b/cinelerra-5.1/plugins/theme_blue/data/xpane_dn.png differ diff --git a/cinelerra-5.1/plugins/theme_blue/data/xpane_hi.png b/cinelerra-5.1/plugins/theme_blue/data/xpane_hi.png index 436c0803..14ca7784 100644 Binary files a/cinelerra-5.1/plugins/theme_blue/data/xpane_hi.png and b/cinelerra-5.1/plugins/theme_blue/data/xpane_hi.png differ diff --git a/cinelerra-5.1/plugins/theme_blue/data/xpane_up.png b/cinelerra-5.1/plugins/theme_blue/data/xpane_up.png index 007cf7a0..8f70e433 100644 Binary files a/cinelerra-5.1/plugins/theme_blue/data/xpane_up.png and b/cinelerra-5.1/plugins/theme_blue/data/xpane_up.png differ diff --git a/cinelerra-5.1/plugins/theme_blue/data/ypane_dn.png b/cinelerra-5.1/plugins/theme_blue/data/ypane_dn.png index 2f7c4dee..2449be14 100644 Binary files a/cinelerra-5.1/plugins/theme_blue/data/ypane_dn.png and b/cinelerra-5.1/plugins/theme_blue/data/ypane_dn.png differ diff --git a/cinelerra-5.1/plugins/theme_blue/data/ypane_hi.png b/cinelerra-5.1/plugins/theme_blue/data/ypane_hi.png index dff6eae9..9efae065 100644 Binary files a/cinelerra-5.1/plugins/theme_blue/data/ypane_hi.png and b/cinelerra-5.1/plugins/theme_blue/data/ypane_hi.png differ diff --git a/cinelerra-5.1/plugins/theme_blue/data/ypane_up.png b/cinelerra-5.1/plugins/theme_blue/data/ypane_up.png index 321bf0c8..4ad7b4e1 100644 Binary files a/cinelerra-5.1/plugins/theme_blue/data/ypane_up.png and b/cinelerra-5.1/plugins/theme_blue/data/ypane_up.png differ diff --git a/cinelerra-5.1/plugins/theme_blue_dot/data/xpane_dn.png b/cinelerra-5.1/plugins/theme_blue_dot/data/xpane_dn.png index 80a7337f..d3f2d9ec 100644 Binary files a/cinelerra-5.1/plugins/theme_blue_dot/data/xpane_dn.png and b/cinelerra-5.1/plugins/theme_blue_dot/data/xpane_dn.png differ diff --git a/cinelerra-5.1/plugins/theme_blue_dot/data/xpane_hi.png b/cinelerra-5.1/plugins/theme_blue_dot/data/xpane_hi.png index 436c0803..14ca7784 100644 Binary files a/cinelerra-5.1/plugins/theme_blue_dot/data/xpane_hi.png and b/cinelerra-5.1/plugins/theme_blue_dot/data/xpane_hi.png differ diff --git a/cinelerra-5.1/plugins/theme_blue_dot/data/xpane_up.png b/cinelerra-5.1/plugins/theme_blue_dot/data/xpane_up.png index 007cf7a0..8f70e433 100644 Binary files a/cinelerra-5.1/plugins/theme_blue_dot/data/xpane_up.png and b/cinelerra-5.1/plugins/theme_blue_dot/data/xpane_up.png differ diff --git a/cinelerra-5.1/plugins/theme_blue_dot/data/ypane_dn.png b/cinelerra-5.1/plugins/theme_blue_dot/data/ypane_dn.png index 2f7c4dee..2449be14 100644 Binary files a/cinelerra-5.1/plugins/theme_blue_dot/data/ypane_dn.png and b/cinelerra-5.1/plugins/theme_blue_dot/data/ypane_dn.png differ diff --git a/cinelerra-5.1/plugins/theme_blue_dot/data/ypane_hi.png b/cinelerra-5.1/plugins/theme_blue_dot/data/ypane_hi.png index dff6eae9..9efae065 100644 Binary files a/cinelerra-5.1/plugins/theme_blue_dot/data/ypane_hi.png and b/cinelerra-5.1/plugins/theme_blue_dot/data/ypane_hi.png differ diff --git a/cinelerra-5.1/plugins/theme_blue_dot/data/ypane_up.png b/cinelerra-5.1/plugins/theme_blue_dot/data/ypane_up.png index 321bf0c8..4ad7b4e1 100644 Binary files a/cinelerra-5.1/plugins/theme_blue_dot/data/ypane_up.png and b/cinelerra-5.1/plugins/theme_blue_dot/data/ypane_up.png differ diff --git a/cinelerra-5.1/plugins/theme_bright/data/xpane_dn.png b/cinelerra-5.1/plugins/theme_bright/data/xpane_dn.png index cdd52f29..8a2fca23 100644 Binary files a/cinelerra-5.1/plugins/theme_bright/data/xpane_dn.png and b/cinelerra-5.1/plugins/theme_bright/data/xpane_dn.png differ diff --git a/cinelerra-5.1/plugins/theme_bright/data/xpane_hi.png b/cinelerra-5.1/plugins/theme_bright/data/xpane_hi.png index d4da75f1..5a03629d 100644 Binary files a/cinelerra-5.1/plugins/theme_bright/data/xpane_hi.png and b/cinelerra-5.1/plugins/theme_bright/data/xpane_hi.png differ diff --git a/cinelerra-5.1/plugins/theme_bright/data/xpane_up.png b/cinelerra-5.1/plugins/theme_bright/data/xpane_up.png index 8e569da5..581c744d 100644 Binary files a/cinelerra-5.1/plugins/theme_bright/data/xpane_up.png and b/cinelerra-5.1/plugins/theme_bright/data/xpane_up.png differ diff --git a/cinelerra-5.1/plugins/theme_bright/data/ypane_dn.png b/cinelerra-5.1/plugins/theme_bright/data/ypane_dn.png index 3236a286..05803ca6 100644 Binary files a/cinelerra-5.1/plugins/theme_bright/data/ypane_dn.png and b/cinelerra-5.1/plugins/theme_bright/data/ypane_dn.png differ diff --git a/cinelerra-5.1/plugins/theme_bright/data/ypane_hi.png b/cinelerra-5.1/plugins/theme_bright/data/ypane_hi.png index ec6ef63e..36147087 100644 Binary files a/cinelerra-5.1/plugins/theme_bright/data/ypane_hi.png and b/cinelerra-5.1/plugins/theme_bright/data/ypane_hi.png differ diff --git a/cinelerra-5.1/plugins/theme_bright/data/ypane_up.png b/cinelerra-5.1/plugins/theme_bright/data/ypane_up.png index 8e95a292..44a3f706 100644 Binary files a/cinelerra-5.1/plugins/theme_bright/data/ypane_up.png and b/cinelerra-5.1/plugins/theme_bright/data/ypane_up.png differ diff --git a/cinelerra-5.1/plugins/theme_cakewalk/data/xpane_dn.png b/cinelerra-5.1/plugins/theme_cakewalk/data/xpane_dn.png index efa5f823..052e927b 100644 Binary files a/cinelerra-5.1/plugins/theme_cakewalk/data/xpane_dn.png and b/cinelerra-5.1/plugins/theme_cakewalk/data/xpane_dn.png differ diff --git a/cinelerra-5.1/plugins/theme_cakewalk/data/xpane_hi.png b/cinelerra-5.1/plugins/theme_cakewalk/data/xpane_hi.png index fb0f39e3..10c87d25 100644 Binary files a/cinelerra-5.1/plugins/theme_cakewalk/data/xpane_hi.png and b/cinelerra-5.1/plugins/theme_cakewalk/data/xpane_hi.png differ diff --git a/cinelerra-5.1/plugins/theme_cakewalk/data/xpane_up.png b/cinelerra-5.1/plugins/theme_cakewalk/data/xpane_up.png index efa5f823..052e927b 100644 Binary files a/cinelerra-5.1/plugins/theme_cakewalk/data/xpane_up.png and b/cinelerra-5.1/plugins/theme_cakewalk/data/xpane_up.png differ diff --git a/cinelerra-5.1/plugins/theme_cakewalk/data/ypane_dn.png b/cinelerra-5.1/plugins/theme_cakewalk/data/ypane_dn.png index 3766da57..b1573ce3 100644 Binary files a/cinelerra-5.1/plugins/theme_cakewalk/data/ypane_dn.png and b/cinelerra-5.1/plugins/theme_cakewalk/data/ypane_dn.png differ diff --git a/cinelerra-5.1/plugins/theme_cakewalk/data/ypane_hi.png b/cinelerra-5.1/plugins/theme_cakewalk/data/ypane_hi.png index df21cda2..0edb49b2 100644 Binary files a/cinelerra-5.1/plugins/theme_cakewalk/data/ypane_hi.png and b/cinelerra-5.1/plugins/theme_cakewalk/data/ypane_hi.png differ diff --git a/cinelerra-5.1/plugins/theme_cakewalk/data/ypane_up.png b/cinelerra-5.1/plugins/theme_cakewalk/data/ypane_up.png index 3766da57..b1573ce3 100644 Binary files a/cinelerra-5.1/plugins/theme_cakewalk/data/ypane_up.png and b/cinelerra-5.1/plugins/theme_cakewalk/data/ypane_up.png differ diff --git a/cinelerra-5.1/plugins/theme_hulk/data/xpane_dn.png b/cinelerra-5.1/plugins/theme_hulk/data/xpane_dn.png index 80a7337f..d3f2d9ec 100644 Binary files a/cinelerra-5.1/plugins/theme_hulk/data/xpane_dn.png and b/cinelerra-5.1/plugins/theme_hulk/data/xpane_dn.png differ diff --git a/cinelerra-5.1/plugins/theme_hulk/data/xpane_hi.png b/cinelerra-5.1/plugins/theme_hulk/data/xpane_hi.png index 436c0803..14ca7784 100644 Binary files a/cinelerra-5.1/plugins/theme_hulk/data/xpane_hi.png and b/cinelerra-5.1/plugins/theme_hulk/data/xpane_hi.png differ diff --git a/cinelerra-5.1/plugins/theme_hulk/data/xpane_up.png b/cinelerra-5.1/plugins/theme_hulk/data/xpane_up.png index 007cf7a0..8f70e433 100644 Binary files a/cinelerra-5.1/plugins/theme_hulk/data/xpane_up.png and b/cinelerra-5.1/plugins/theme_hulk/data/xpane_up.png differ diff --git a/cinelerra-5.1/plugins/theme_hulk/data/ypane_dn.png b/cinelerra-5.1/plugins/theme_hulk/data/ypane_dn.png index 2f7c4dee..2449be14 100644 Binary files a/cinelerra-5.1/plugins/theme_hulk/data/ypane_dn.png and b/cinelerra-5.1/plugins/theme_hulk/data/ypane_dn.png differ diff --git a/cinelerra-5.1/plugins/theme_hulk/data/ypane_hi.png b/cinelerra-5.1/plugins/theme_hulk/data/ypane_hi.png index dff6eae9..9efae065 100644 Binary files a/cinelerra-5.1/plugins/theme_hulk/data/ypane_hi.png and b/cinelerra-5.1/plugins/theme_hulk/data/ypane_hi.png differ diff --git a/cinelerra-5.1/plugins/theme_hulk/data/ypane_up.png b/cinelerra-5.1/plugins/theme_hulk/data/ypane_up.png index 321bf0c8..4ad7b4e1 100644 Binary files a/cinelerra-5.1/plugins/theme_hulk/data/ypane_up.png and b/cinelerra-5.1/plugins/theme_hulk/data/ypane_up.png differ diff --git a/cinelerra-5.1/plugins/theme_neophyte/data/xpane_dn.png b/cinelerra-5.1/plugins/theme_neophyte/data/xpane_dn.png index ef31e281..d3f2d9ec 100644 Binary files a/cinelerra-5.1/plugins/theme_neophyte/data/xpane_dn.png and b/cinelerra-5.1/plugins/theme_neophyte/data/xpane_dn.png differ diff --git a/cinelerra-5.1/plugins/theme_neophyte/data/xpane_hi.png b/cinelerra-5.1/plugins/theme_neophyte/data/xpane_hi.png index 6e209afc..7ced2ccd 100644 Binary files a/cinelerra-5.1/plugins/theme_neophyte/data/xpane_hi.png and b/cinelerra-5.1/plugins/theme_neophyte/data/xpane_hi.png differ diff --git a/cinelerra-5.1/plugins/theme_neophyte/data/xpane_up.png b/cinelerra-5.1/plugins/theme_neophyte/data/xpane_up.png index 080c2dd6..8f70e433 100644 Binary files a/cinelerra-5.1/plugins/theme_neophyte/data/xpane_up.png and b/cinelerra-5.1/plugins/theme_neophyte/data/xpane_up.png differ diff --git a/cinelerra-5.1/plugins/theme_neophyte/data/ypane_dn.png b/cinelerra-5.1/plugins/theme_neophyte/data/ypane_dn.png index 2f64b273..2449be14 100644 Binary files a/cinelerra-5.1/plugins/theme_neophyte/data/ypane_dn.png and b/cinelerra-5.1/plugins/theme_neophyte/data/ypane_dn.png differ diff --git a/cinelerra-5.1/plugins/theme_neophyte/data/ypane_hi.png b/cinelerra-5.1/plugins/theme_neophyte/data/ypane_hi.png index d59f1145..9efae065 100644 Binary files a/cinelerra-5.1/plugins/theme_neophyte/data/ypane_hi.png and b/cinelerra-5.1/plugins/theme_neophyte/data/ypane_hi.png differ diff --git a/cinelerra-5.1/plugins/theme_neophyte/data/ypane_up.png b/cinelerra-5.1/plugins/theme_neophyte/data/ypane_up.png index 8000523f..4ad7b4e1 100644 Binary files a/cinelerra-5.1/plugins/theme_neophyte/data/ypane_up.png and b/cinelerra-5.1/plugins/theme_neophyte/data/ypane_up.png differ diff --git a/cinelerra-5.1/plugins/theme_pinklady/data/xpane_dn.png b/cinelerra-5.1/plugins/theme_pinklady/data/xpane_dn.png index 80a7337f..d3f2d9ec 100644 Binary files a/cinelerra-5.1/plugins/theme_pinklady/data/xpane_dn.png and b/cinelerra-5.1/plugins/theme_pinklady/data/xpane_dn.png differ diff --git a/cinelerra-5.1/plugins/theme_pinklady/data/xpane_hi.png b/cinelerra-5.1/plugins/theme_pinklady/data/xpane_hi.png index 436c0803..14ca7784 100644 Binary files a/cinelerra-5.1/plugins/theme_pinklady/data/xpane_hi.png and b/cinelerra-5.1/plugins/theme_pinklady/data/xpane_hi.png differ diff --git a/cinelerra-5.1/plugins/theme_pinklady/data/xpane_up.png b/cinelerra-5.1/plugins/theme_pinklady/data/xpane_up.png index 007cf7a0..8f70e433 100644 Binary files a/cinelerra-5.1/plugins/theme_pinklady/data/xpane_up.png and b/cinelerra-5.1/plugins/theme_pinklady/data/xpane_up.png differ diff --git a/cinelerra-5.1/plugins/theme_pinklady/data/ypane_dn.png b/cinelerra-5.1/plugins/theme_pinklady/data/ypane_dn.png index 2f7c4dee..2449be14 100644 Binary files a/cinelerra-5.1/plugins/theme_pinklady/data/ypane_dn.png and b/cinelerra-5.1/plugins/theme_pinklady/data/ypane_dn.png differ diff --git a/cinelerra-5.1/plugins/theme_pinklady/data/ypane_hi.png b/cinelerra-5.1/plugins/theme_pinklady/data/ypane_hi.png index dff6eae9..9efae065 100644 Binary files a/cinelerra-5.1/plugins/theme_pinklady/data/ypane_hi.png and b/cinelerra-5.1/plugins/theme_pinklady/data/ypane_hi.png differ diff --git a/cinelerra-5.1/plugins/theme_pinklady/data/ypane_up.png b/cinelerra-5.1/plugins/theme_pinklady/data/ypane_up.png index 321bf0c8..4ad7b4e1 100644 Binary files a/cinelerra-5.1/plugins/theme_pinklady/data/ypane_up.png and b/cinelerra-5.1/plugins/theme_pinklady/data/ypane_up.png differ diff --git a/cinelerra-5.1/plugins/theme_suv/data/xpane_dn.png b/cinelerra-5.1/plugins/theme_suv/data/xpane_dn.png index 80a7337f..d3f2d9ec 100644 Binary files a/cinelerra-5.1/plugins/theme_suv/data/xpane_dn.png and b/cinelerra-5.1/plugins/theme_suv/data/xpane_dn.png differ diff --git a/cinelerra-5.1/plugins/theme_suv/data/xpane_hi.png b/cinelerra-5.1/plugins/theme_suv/data/xpane_hi.png index 436c0803..14ca7784 100644 Binary files a/cinelerra-5.1/plugins/theme_suv/data/xpane_hi.png and b/cinelerra-5.1/plugins/theme_suv/data/xpane_hi.png differ diff --git a/cinelerra-5.1/plugins/theme_suv/data/xpane_up.png b/cinelerra-5.1/plugins/theme_suv/data/xpane_up.png index 007cf7a0..8f70e433 100644 Binary files a/cinelerra-5.1/plugins/theme_suv/data/xpane_up.png and b/cinelerra-5.1/plugins/theme_suv/data/xpane_up.png differ diff --git a/cinelerra-5.1/plugins/theme_suv/data/ypane_dn.png b/cinelerra-5.1/plugins/theme_suv/data/ypane_dn.png index 2f7c4dee..2449be14 100644 Binary files a/cinelerra-5.1/plugins/theme_suv/data/ypane_dn.png and b/cinelerra-5.1/plugins/theme_suv/data/ypane_dn.png differ diff --git a/cinelerra-5.1/plugins/theme_suv/data/ypane_hi.png b/cinelerra-5.1/plugins/theme_suv/data/ypane_hi.png index dff6eae9..9efae065 100644 Binary files a/cinelerra-5.1/plugins/theme_suv/data/ypane_hi.png and b/cinelerra-5.1/plugins/theme_suv/data/ypane_hi.png differ diff --git a/cinelerra-5.1/plugins/theme_suv/data/ypane_up.png b/cinelerra-5.1/plugins/theme_suv/data/ypane_up.png index 321bf0c8..4ad7b4e1 100644 Binary files a/cinelerra-5.1/plugins/theme_suv/data/ypane_up.png and b/cinelerra-5.1/plugins/theme_suv/data/ypane_up.png differ diff --git a/cinelerra-5.1/plugins/theme_unflat/data/xpane_dn.png b/cinelerra-5.1/plugins/theme_unflat/data/xpane_dn.png index 80a7337f..d3f2d9ec 100644 Binary files a/cinelerra-5.1/plugins/theme_unflat/data/xpane_dn.png and b/cinelerra-5.1/plugins/theme_unflat/data/xpane_dn.png differ diff --git a/cinelerra-5.1/plugins/theme_unflat/data/xpane_hi.png b/cinelerra-5.1/plugins/theme_unflat/data/xpane_hi.png index 436c0803..14ca7784 100644 Binary files a/cinelerra-5.1/plugins/theme_unflat/data/xpane_hi.png and b/cinelerra-5.1/plugins/theme_unflat/data/xpane_hi.png differ diff --git a/cinelerra-5.1/plugins/theme_unflat/data/xpane_up.png b/cinelerra-5.1/plugins/theme_unflat/data/xpane_up.png index 007cf7a0..8f70e433 100644 Binary files a/cinelerra-5.1/plugins/theme_unflat/data/xpane_up.png and b/cinelerra-5.1/plugins/theme_unflat/data/xpane_up.png differ diff --git a/cinelerra-5.1/plugins/theme_unflat/data/ypane_dn.png b/cinelerra-5.1/plugins/theme_unflat/data/ypane_dn.png index 2f7c4dee..2449be14 100644 Binary files a/cinelerra-5.1/plugins/theme_unflat/data/ypane_dn.png and b/cinelerra-5.1/plugins/theme_unflat/data/ypane_dn.png differ diff --git a/cinelerra-5.1/plugins/theme_unflat/data/ypane_hi.png b/cinelerra-5.1/plugins/theme_unflat/data/ypane_hi.png index dff6eae9..9efae065 100644 Binary files a/cinelerra-5.1/plugins/theme_unflat/data/ypane_hi.png and b/cinelerra-5.1/plugins/theme_unflat/data/ypane_hi.png differ diff --git a/cinelerra-5.1/plugins/theme_unflat/data/ypane_up.png b/cinelerra-5.1/plugins/theme_unflat/data/ypane_up.png index 321bf0c8..4ad7b4e1 100644 Binary files a/cinelerra-5.1/plugins/theme_unflat/data/ypane_up.png and b/cinelerra-5.1/plugins/theme_unflat/data/ypane_up.png differ