projects
/
goodguy
/
history.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
replace spash/about bg img, fix transition strip, include olaf de.po+neophyte, update...
[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 96e60c01eb258eaa537f6fad17a64e634eea614f..6806848151c5551abcd0f38a2670a776aa7820aa 100644
(file)
--- a/
cinelerra-5.1/cinelerra/clippopup.C
+++ b/
cinelerra-5.1/cinelerra/clippopup.C
@@
-32,6
+32,7
@@
#include "edit.h"
#include "edits.h"
#include "edl.h"
#include "edit.h"
#include "edits.h"
#include "edl.h"
+#include "edlsession.h"
#include "filexml.h"
#include "language.h"
#include "localsession.h"
#include "filexml.h"
#include "language.h"
#include "localsession.h"
@@
-174,7
+175,7
@@
ClipPopupSort::~ClipPopupSort()
int ClipPopupSort::handle_event()
{
int ClipPopupSort::handle_event()
{
- mwindow->awindow->gui->sort_assets(
0
);
+ mwindow->awindow->gui->sort_assets();
return 1;
}
return 1;
}
@@
-429,7
+430,10
@@
int ClipPopupNest::handle_event()
{
MWindowGUI *gui = mwindow->gui;
gui->lock_window("ClipPopupNest::handle_event 1");
{
MWindowGUI *gui = mwindow->gui;
gui->lock_window("ClipPopupNest::handle_event 1");
- if( mwindow->session->drag_clips->total > 0 ) {
+ if( mwindow->edl->session->proxy_scale != 1 ) {
+ eprintf("Nesting not allowed when proxy scale != 1");
+ }
+ else if( mwindow->session->drag_clips->total > 0 ) {
EDL *edl = mwindow->edl;
time_t dt; time(&dt);
struct tm dtm; localtime_r(&dt, &dtm);
EDL *edl = mwindow->edl;
time_t dt; time(&dt);
struct tm dtm; localtime_r(&dt, &dtm);
@@
-488,7
+492,9
@@
int ClipPopupUnNest::handle_event()
nested_edl = edit && !edit->next && !edit->asset ? edit->nested_edl : 0;
while( nested_edl && (track=track->next)!=0 ) {
Edit *edit = track->edits->first;
nested_edl = edit && !edit->next && !edit->asset ? edit->nested_edl : 0;
while( nested_edl && (track=track->next)!=0 ) {
Edit *edit = track->edits->first;
- if( !edit || edit->next || edit->nested_edl != nested_edl )
+ if( !edit || edit->next ||
+ ( edit->nested_edl != nested_edl &&
+ strcmp(edit->nested_edl->path, nested_edl->path) ) )
nested_edl = 0;
}
if( nested_edl ) {
nested_edl = 0;
}
if( nested_edl ) {