X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fsynfigapp%2Fcanvasinterface.cpp;h=1757952669647fc0b1c9c7f718320eb4610d0ad7;hb=98b0b5b6cc30e2faef4e14a97c5ec6b17b4386ef;hp=0f6872aefc6b05963b5bc9b7308025a759b5c5fd;hpb=837b63e9fb829d66d43f4f169861f8979f76820d;p=synfig.git

diff --git a/synfig-studio/trunk/src/synfigapp/canvasinterface.cpp b/synfig-studio/trunk/src/synfigapp/canvasinterface.cpp
index 0f6872a..1757952 100644
--- a/synfig-studio/trunk/src/synfigapp/canvasinterface.cpp
+++ b/synfig-studio/trunk/src/synfigapp/canvasinterface.cpp
@@ -463,7 +463,7 @@ CanvasInterface::jump_to_prev_keyframe()
 }
 
 bool
-CanvasInterface::import(const synfig::String &filename, bool copy)
+CanvasInterface::import(const synfig::String &filename, bool /*copy*/)
 {
 	Action::PassiveGrouper group(get_instance().get(),_("Import Image"));
 
@@ -489,7 +489,7 @@ CanvasInterface::import(const synfig::String &filename, bool copy)
 
 		Layer::Handle layer(add_layer_to("PasteCanvas",get_canvas()));
 		if(!layer)
-			throw String(_("Unable to create \"PasteCanvas\" layer"));
+			throw String(_("Unable to create \"Paste Canvas\" layer"));
 		if(!layer->set_param("canvas",ValueBase(outside_canvas)))
 			throw int();
 
@@ -508,8 +508,6 @@ CanvasInterface::import(const synfig::String &filename, bool copy)
 		return false;
 	}
 
-
-
 	if(!Importer::book().count(ext))
 	{
 		get_ui_interface()->error(_("I don't know how to open images of this type -- ")+ext);
@@ -617,7 +615,7 @@ CanvasInterface::waypoint_remove(synfigapp::ValueDesc value_desc,synfig::Waypoin
 
 
 void
-CanvasInterface::auto_export(ValueNode::Handle value_node)
+CanvasInterface::auto_export(ValueNode::Handle /*value_node*/)
 {
 /*
 	// Check to see if we are already exported.
@@ -643,7 +641,7 @@ CanvasInterface::auto_export(ValueNode::Handle value_node)
 }
 
 void
-CanvasInterface::auto_export(const ValueDesc& value_desc)
+CanvasInterface::auto_export(const ValueDesc& /*value_desc*/)
 {
 	// THIS FUNCTION IS DEPRECATED, AND IS NOW A STUB.
 #if 0
@@ -821,10 +819,10 @@ CanvasInterface::seek_frame(int frames)
 	Time newtime(get_time()+(float)frames/fps);
 	newtime=newtime.round(fps);
 
-	if(newtime<=get_canvas()->rend_desc().get_frame_start())
-		newtime=get_canvas()->rend_desc().get_frame_start();
-	if(newtime>=get_canvas()->rend_desc().get_frame_end())
-		newtime=get_canvas()->rend_desc().get_frame_end();
+	if(newtime<=get_canvas()->rend_desc().get_time_start())
+		newtime=get_canvas()->rend_desc().get_time_start();
+	if(newtime>=get_canvas()->rend_desc().get_time_end())
+		newtime=get_canvas()->rend_desc().get_time_end();
 	set_time(newtime);
 }
 
@@ -843,7 +841,7 @@ CanvasInterface::seek_time(synfig::Time time)
 	}
 	if(time<=synfig::Time::begin())
 	{
-		set_time(get_canvas()->rend_desc().get_time_end());
+		set_time(get_canvas()->rend_desc().get_time_start());
 		return;
 	}