X-Git-Url: https://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Ftransition.C;h=3389457f0a0b2f7faf26a077c3ab541d7c78d222;hb=6c6367a007ab0f67538ad165e5815e66183a3997;hp=f321c47235233e73351101a6d3439610c95c5ac5;hpb=7fd85fb66168f6b518c5f2d73e04036e87faa0e1;p=goodguy%2Fcinelerra.git

diff --git a/cinelerra-5.1/cinelerra/transition.C b/cinelerra-5.1/cinelerra/transition.C
index f321c472..3389457f 100644
--- a/cinelerra-5.1/cinelerra/transition.C
+++ b/cinelerra-5.1/cinelerra/transition.C
@@ -2,6 +2,7 @@
 /*
  * CINELERRA
  * Copyright (C) 2008 Adam Williams <broadcast at earthling dot net>
+ * Copyright (C) 2003-2016 Cinelerra CV contributors
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -160,8 +161,7 @@ void Transition::save_xml(FileXML *file)
 	file->tag.set_property("TITLE", title);
 	file->tag.set_property("LENGTH", length);
 	file->append_tag();
-	if(on)
-	{
+	if( on ) {
 		file->tag.set_title("ON");
 		file->append_tag();
 		file->tag.set_title("/ON");
@@ -175,36 +175,20 @@ void Transition::save_xml(FileXML *file)
 
 void Transition::load_xml(FileXML *file)
 {
-	int result = 0;
 	file->tag.get_property("TITLE", title);
 	Plugin::fix_plugin_title(title);
 	length = file->tag.get_property("LENGTH", length);
 	on = 0;
 
-	do{
-		result = file->read_tag();
-		if(!result)
-		{
-			if(file->tag.title_is("/TRANSITION"))
-			{
-				result = 1;
-			}
-			else
-			if(file->tag.title_is("ON"))
-			{
-				on = 1;
-			}
-			else
-			if(file->tag.title_is("KEYFRAME"))
-			{
-				keyframes->default_auto->load(file);;
-			}
-		}
-	}while(!result);
+	while( !file->read_tag() ) {
+		if( file->tag.title_is("/TRANSITION") ) break;
+		if( file->tag.title_is("ON") ) { on = 1;  continue; }
+		if( file->tag.title_is("KEYFRAME") )
+			keyframes->default_auto->load(file);;
+	}
 }
 
 
-
 int Transition::popup_transition(int x, int y)
 {
 // 	if(mwindow->session->tracks_vertical)