projects
/
synfig.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
moreupdates
[synfig.git]
/
synfig-core
/
trunk
/
src
/
synfig
/
time.cpp
diff --git
a/synfig-core/trunk/src/synfig/time.cpp
b/synfig-core/trunk/src/synfig/time.cpp
index
e225633
..
ebaacdf
100644
(file)
--- a/
synfig-core/trunk/src/synfig/time.cpp
+++ b/
synfig-core/trunk/src/synfig/time.cpp
@@
-1,4
+1,4
@@
-/* === S
I N F G ==
========================================================= */
+/* === S
Y N F I G
========================================================= */
/*! \file time.cpp
** \brief Template File
**
/*! \file time.cpp
** \brief Template File
**
@@
-59,7
+59,7
@@
extern "C" { int _isnan(double x); }
using namespace std;
using namespace etl;
using namespace std;
using namespace etl;
-using namespace s
inf
g;
+using namespace s
ynfi
g;
#define tolower ::tolower
#define tolower ::tolower
@@
-104,7
+104,7
@@
Time::Time(const String &str_, float fps):
// to warn about units if the value is zero
// it is the only case where units are irrelevant.
if(amount!=0)
// to warn about units if the value is zero
// it is the only case where units are irrelevant.
if(amount!=0)
- s
inf
g::warning("Time(): No unit provided in time code, assuming SECONDS (\"%s\")",str.c_str());
+ s
ynfi
g::warning("Time(): No unit provided in time code, assuming SECONDS (\"%s\")",str.c_str());
value_+=amount;
return;
}
value_+=amount;
return;
}
@@
-127,7
+127,7
@@
Time::Time(const String &str_, float fps):
if(fps)
value_+=amount/fps;
else
if(fps)
value_+=amount/fps;
else
- s
inf
g::warning("Time(): Individual frames referenced, but frame rate is unknown");
+ s
ynfi
g::warning("Time(): Individual frames referenced, but frame rate is unknown");
break;
case ':':
// try to read it in as a traditional time format
break;
case ':':
// try to read it in as a traditional time format
@@
-146,12
+146,12
@@
Time::Time(const String &str_, float fps):
return;
}
}
return;
}
}
- s
inf
g::warning("Time(): Bad time format");
+ s
ynfi
g::warning("Time(): Bad time format");
break;
default:
value_+=amount;
break;
default:
value_+=amount;
- s
inf
g::warning("Time(): Unexpected character '%c' when parsing time string \"%s\"",str[pos],str.c_str());
+ s
ynfi
g::warning("Time(): Unexpected character '%c' when parsing time string \"%s\"",str[pos],str.c_str());
break;
}
pos++;
break;
}
pos++;