projects
/
goodguy
/
cinelerra.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add refresh_only to scopewindow, fix alsa prefs for capture source, add python to...
[goodguy/cinelerra.git]
/
cinelerra-5.1
/
cinelerra
/
main.C
diff --git
a/cinelerra-5.1/cinelerra/main.C
b/cinelerra-5.1/cinelerra/main.C
index 6e0b6d5e7422a3027b107139ef71e8dd52bf692c..8a4815f9eb32d469189a6e30fd963ce67b34e826 100644
(file)
--- a/
cinelerra-5.1/cinelerra/main.C
+++ b/
cinelerra-5.1/cinelerra/main.C
@@
-106,7
+106,8
@@
public:
//PRINT_TRACE
mwindow->gui->lock_window("main");
//PRINT_TRACE
//PRINT_TRACE
mwindow->gui->lock_window("main");
//PRINT_TRACE
- mwindow->load_filenames(filenames, LOADMODE_REPLACE);
+ mwindow->load_filenames(filenames,
+ LOADMODE_REPLACE, LOADMODE_EDL_CLIP);
//PRINT_TRACE
if( filenames->size() == 1 )
mwindow->gui->mainmenu->add_load(filenames->get(0));
//PRINT_TRACE
if( filenames->size() == 1 )
mwindow->gui->mainmenu->add_load(filenames->get(0));
@@
-145,6
+146,7
@@
int main(int argc, char *argv[])
// handle command line arguments first
srand(time(0));
ArrayList<char*> filenames;
// handle command line arguments first
srand(time(0));
ArrayList<char*> filenames;
+ filenames.set_array_delete();
FileSystem fs;
time_t st; time(&st);
FileSystem fs;
time_t st; time(&st);
@@
-361,7
+363,7
@@
int main(int argc, char *argv[])
MWindow mwindow;
mwindow.create_objects(1, !filenames.total, config_path);
CommandLineThread *thread = 0;
MWindow mwindow;
mwindow.create_objects(1, !filenames.total, config_path);
CommandLineThread *thread = 0;
- if(
mwindow.preferences->perpetual_session &&
load_perpetual )
+ if( load_perpetual )
mwindow.load_undo_data();
//SET_TRACE
// load the initial files on seperate tracks
mwindow.load_undo_data();
//SET_TRACE
// load the initial files on seperate tracks
@@
-397,8
+399,7
@@
int main(int argc, char *argv[])
done = 1;
mwindow.save_defaults();
done = 1;
mwindow.save_defaults();
- if( mwindow.preferences->perpetual_session )
- mwindow.save_undo_data();
+ mwindow.save_undo_data();
//PRINT_TRACE
filenames.remove_all_objects();
delete thread;
//PRINT_TRACE
filenames.remove_all_objects();
delete thread;