aboutsummaryrefslogtreecommitdiff
path: root/engines/sci/sfx/time.cpp
diff options
context:
space:
mode:
authorPaweł Kołodziejski2009-02-21 16:20:53 +0000
committerPaweł Kołodziejski2009-02-21 16:20:53 +0000
commitd23166c2a1bc8747dbc0684320eeba5f4ffd254f (patch)
treeb292ededb74776ba1e483c5837d01968303f6d7a /engines/sci/sfx/time.cpp
parent1ee65390cd634ba9b432843f11d51cdff0401320 (diff)
downloadscummvm-rg350-d23166c2a1bc8747dbc0684320eeba5f4ffd254f.tar.gz
scummvm-rg350-d23166c2a1bc8747dbc0684320eeba5f4ffd254f.tar.bz2
scummvm-rg350-d23166c2a1bc8747dbc0684320eeba5f4ffd254f.zip
formating
svn-id: r38706
Diffstat (limited to 'engines/sci/sfx/time.cpp')
-rw-r--r--engines/sci/sfx/time.cpp19
1 files changed, 6 insertions, 13 deletions
diff --git a/engines/sci/sfx/time.cpp b/engines/sci/sfx/time.cpp
index a57f8488ab..42af86dacf 100644
--- a/engines/sci/sfx/time.cpp
+++ b/engines/sci/sfx/time.cpp
@@ -28,8 +28,7 @@
namespace Sci {
-sfx_timestamp_t
-sfx_new_timestamp(long secs, long usecs, int frame_rate) {
+sfx_timestamp_t sfx_new_timestamp(long secs, long usecs, int frame_rate) {
sfx_timestamp_t r;
r.secs = secs;
r.usecs = usecs;
@@ -39,9 +38,7 @@ sfx_new_timestamp(long secs, long usecs, int frame_rate) {
return r;
}
-
-sfx_timestamp_t
-sfx_timestamp_add(sfx_timestamp_t timestamp, int frames) {
+sfx_timestamp_t sfx_timestamp_add(sfx_timestamp_t timestamp, int frames) {
timestamp.frame_offset += frames;
if (timestamp.frame_offset < 0) {
@@ -57,8 +54,7 @@ sfx_timestamp_add(sfx_timestamp_t timestamp, int frames) {
return timestamp;
}
-int
-sfx_timestamp_frame_diff(sfx_timestamp_t a, sfx_timestamp_t b) {
+int sfx_timestamp_frame_diff(sfx_timestamp_t a, sfx_timestamp_t b) {
long usecdelta = 0;
if (a.frame_rate != b.frame_rate) {
@@ -81,8 +77,7 @@ sfx_timestamp_frame_diff(sfx_timestamp_t a, sfx_timestamp_t b) {
+ a.frame_offset - b.frame_offset;
}
-long
-sfx_timestamp_usecs_diff(sfx_timestamp_t t1, sfx_timestamp_t t2) {
+long sfx_timestamp_usecs_diff(sfx_timestamp_t t1, sfx_timestamp_t t2) {
long secs1, secs2;
long usecs1, usecs2;
@@ -92,8 +87,7 @@ sfx_timestamp_usecs_diff(sfx_timestamp_t t1, sfx_timestamp_t t2) {
return (usecs1 - usecs2) + ((secs1 - secs2) * 1000000);
}
-sfx_timestamp_t
-sfx_timestamp_renormalise(sfx_timestamp_t timestamp, int new_freq) {
+sfx_timestamp_t sfx_timestamp_renormalise(sfx_timestamp_t timestamp, int new_freq) {
sfx_timestamp_t r;
sfx_timestamp_gettime(&timestamp, &r.secs, &r.usecs);
r.frame_rate = new_freq;
@@ -102,8 +96,7 @@ sfx_timestamp_renormalise(sfx_timestamp_t timestamp, int new_freq) {
return r;
}
-void
-sfx_timestamp_gettime(sfx_timestamp_t *timestamp, long *secs, long *usecs) {
+void sfx_timestamp_gettime(sfx_timestamp_t *timestamp, long *secs, long *usecs) {
long ust = timestamp->usecs;
/* On 64 bit machines, we can do an accurate computation */
#if (SIZEOF_LONG >= 8)