Updates #268 and implements "use clock" persistent setting in GRFX file

cplussharp · Jun 30, 2015 · dd30187 · dd30187
1 parent b1a99da
commit dd30187
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/src/display_graph.cpp b/src/display_graph.cpp
@@ -1180,6 +1180,8 @@ GRAPHSTUDIO_NAMESPACE_START			// cf stdafx.h for explanation
 
 		xml.BeginNode(_T("graph"));
 			xml.WriteValue(_T("name"), _T("Unnamed Graph"));
+			if(!uses_clock)
+				xml.WriteValue(_T("clock"), _T("none"));
 
 			for (int i=0; i<filters.GetCount(); i++) {
 				SaveXML_Filter(xml, filters[i], i);
@@ -1218,6 +1220,9 @@ GRAPHSTUDIO_NAMESPACE_START			// cf stdafx.h for explanation
 
 		XML::XMLNode * const gn = *it;
 
+		const CString clock = gn->GetValue(_T("clock"));
+		uses_clock = clock != _T("none");
+
 		// Filter list stored in the same order as stored in XML file for fixing up Filter index references
 		// Only store for the duration of loading
 		// The IBaseFilter* are only used to find matching Filters so will not crash if pointers are invalid

diff --git a/src/graphView.cpp b/src/graphView.cpp
@@ -1210,7 +1210,7 @@ HRESULT CGraphView::TryOpenFile(const CString& file_to_open, bool render_media_f
     }
 
 	UpdateGraphState();
-	graph.SetClock(true, NULL);
+	graph.SetClock(graph.uses_clock, NULL);
 	graph.RefreshFilters();
 	graph.SmartPlacement();
 	Invalidate();