X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Ftracks.C;h=08952e429d3fbd06e50bfe9859b335a15e623ceb;hb=7e5a0760f40ff787cc3d93cb7768a901ebe52809;hp=4df744922f1d50941a8081c007f6333c596df37f;hpb=576087eacf577a0fa5d3008d37c4d5b597f0990a;p=goodguy%2Fhistory.git diff --git a/cinelerra-5.1/cinelerra/tracks.C b/cinelerra-5.1/cinelerra/tracks.C index 4df74492..08952e42 100644 --- a/cinelerra-5.1/cinelerra/tracks.C +++ b/cinelerra-5.1/cinelerra/tracks.C @@ -201,31 +201,23 @@ int Tracks::load(FileXML *xml, xml->tag.get_property("TYPE", string); if((load_flags & LOAD_ALL) == LOAD_ALL || - (load_flags & LOAD_EDITS)) - { - if(!strcmp(string, "VIDEO")) - { - add_video_track(0, 0); + (load_flags & LOAD_EDITS)) { + if(!strcmp(string, "VIDEO")) { + track = add_video_track(0, 0); } - else - if(!strcmp(string, "SUBTTL")) - { - add_subttl_track(0, 0); + else if(!strcmp(string, "SUBTTL")) { + track = add_subttl_track(0, 0); } - else - { - add_audio_track(0, 0); // default to audio + else { + track = add_audio_track(0, 0); // default to audio } - track = last; } - else - { - track = get_item_number(track_offset); - track_offset++; + else { + track = get_item_number(track_offset++); } // load it - if(track) track->load(xml, track_offset, load_flags); + if( track ) track->load(xml, track_offset, load_flags); return 0; }