projects
/
goodguy
/
history.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
olaf updates neophyte theme, keypad numlock tweaks
[goodguy/history.git]
/
cinelerra-5.1
/
cinelerra
/
localsession.C
diff --git
a/cinelerra-5.1/cinelerra/localsession.C
b/cinelerra-5.1/cinelerra/localsession.C
index eace821b2c7d67c43983d58c045f18b6a71afc75..890ff0adceea4dd996aed3d3fab83deb1335e2ca 100644
(file)
--- a/
cinelerra-5.1/cinelerra/localsession.C
+++ b/
cinelerra-5.1/cinelerra/localsession.C
@@
-69,7
+69,7
@@
LocalSession::LocalSession(EDL *edl)
loop_start = loop_end = 0;
playback_start = -1;
playback_end = 0;
loop_start = loop_end = 0;
playback_start = -1;
playback_end = 0;
- preview_start =
preview_end = 0
;
+ preview_start =
0; preview_end = -1
;
zoom_sample = DEFAULT_ZOOM_TIME;
zoom_y = 0;
zoom_track = 0;
zoom_sample = DEFAULT_ZOOM_TIME;
zoom_y = 0;
zoom_track = 0;
@@
-189,10
+189,9
@@
void LocalSession::save_xml(FileXML *file, double start)
file->tag.set_property("ZOOM_TRACK", zoom_track);
double preview_start = this->preview_start - start;
file->tag.set_property("ZOOM_TRACK", zoom_track);
double preview_start = this->preview_start - start;
- if(
preview_start < 0
) preview_start = 0;
+ if(
preview_start < 0
) preview_start = 0;
double preview_end = this->preview_end - start;
double preview_end = this->preview_end - start;
- if(preview_end < 0) preview_end = 0;
-
+ if( preview_end < preview_start ) preview_end = -1;
file->tag.set_property("PREVIEW_START", preview_start);
file->tag.set_property("PREVIEW_END", preview_end);
file->tag.set_property("FLOATAUTO_TYPE", floatauto_type);
file->tag.set_property("PREVIEW_START", preview_start);
file->tag.set_property("PREVIEW_END", preview_end);
file->tag.set_property("FLOATAUTO_TYPE", floatauto_type);
@@
-507,12
+506,3
@@
int LocalSession::outpoint_valid()
return out_point >= 0;
}
return out_point >= 0;
}
-void LocalSession::set_clip_path(Indexable *indexable)
-{
- char string[BCTEXTLEN];
- FileSystem fs;
- fs.extract_name(string, indexable->path);
- strcpy(clip_title, string);
-}
-
-