projects
/
goodguy
/
history.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
repeat play, in/out <> shortcuts, append to proj wording, cleanup
[goodguy/history.git]
/
cinelerra-5.1
/
cinelerra
/
edit.C
diff --git
a/cinelerra-5.1/cinelerra/edit.C
b/cinelerra-5.1/cinelerra/edit.C
index 4c257cbe964164a274187b3ab11f8d6515048d9f..9eb0d9d8f885aedabd0c9aac3d745a6b9a97e64d 100644
(file)
--- a/
cinelerra-5.1/cinelerra/edit.C
+++ b/
cinelerra-5.1/cinelerra/edit.C
@@
-33,6
+33,7
@@
#include "plugin.h"
#include "mainsession.h"
#include "nestededls.h"
#include "plugin.h"
#include "mainsession.h"
#include "nestededls.h"
+#include "strack.h"
#include "trackcanvas.h"
#include "tracks.h"
#include "transition.h"
#include "trackcanvas.h"
#include "tracks.h"
#include "transition.h"
@@
-233,7
+234,9
@@
void Edit::detach_transition()
int Edit::silence()
{
int Edit::silence()
{
- return asset || nested_edl ? 0 : 1;
+ return (track->data_type != TRACK_SUBTITLE ?
+ asset || nested_edl :
+ *((SEdit *)this)->get_text()) ? 0 : 1;
}
}