mantarimay/Aegisub
1
0
Fork 0
forked from mia/Aegisub
Code Pull requests Activity

Create time_log() to return a timeval so I can implement this on windows as well.

Browse source 
Originally committed to SVN as r4391.
This commit is contained in:
Amar Takhar 2010-06-01 05:11:18 +00:00
parent ac42fcda5d
commit 37b904b75e
4 changed files with 20 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
aegisub/libaegisub/common/log.cpp
View file

@ -25,6 +25,7 @@
#include "libaegisub/log.h" #include "libaegisub/log.h"
#include "libaegisub/mutex.h" #include "libaegisub/mutex.h"
#include "libaegisub/util.h"
namespace agi { namespace agi {
namespace log { namespace log {
@ -129,7 +130,7 @@ Message::Message(const char *section,
buf = new char[len]; buf = new char[len];
msg = new std::ostrstream(buf, len); msg = new std::ostrstream(buf, len);
timeval tv; timeval tv;
gettimeofday(&tv, (struct timezone *)NULL); util::time_log(tv);
sm = new SinkMessage(section, severity, file, func, line, tv); sm = new SinkMessage(section, severity, file, func, line, tv);
} }

7
aegisub/libaegisub/include/libaegisub/log.h
View file

@ -19,6 +19,13 @@
/// @ingroup libaegisub /// @ingroup libaegisub
#ifndef LAGI_PRE #ifndef LAGI_PRE
#include <stdio.h>
#ifdef _WIN32
# include <time.h>
#else
# include <sys/time.h>
#endif // _WIN32
#include <deque> #include <deque>
#ifdef __DEPRECATED // Dodge GCC warnings #ifdef __DEPRECATED // Dodge GCC warnings
# undef __DEPRECATED # undef __DEPRECATED

9
aegisub/libaegisub/include/libaegisub/util.h
View file

@ -21,7 +21,12 @@
#ifndef LAGI_PRE #ifndef LAGI_PRE
#include <string> #include <string>
#include <stdio.h> #include <stdio.h>
#endif #ifdef _WIN32
# include <time.h>
#else
# include <sys/time.h>
#endif // _WIN32
#endif // LAGI_PRE
#include <libaegisub/access.h> #include <libaegisub/access.h>
@ -30,7 +35,7 @@ namespace agi {
const std::string DirName(const std::string& path); const std::string DirName(const std::string& path);
void Rename(const std::string& from, const std::string& to); void Rename(const std::string& from, const std::string& to);
void time_log(timeval &tv);
} // namespace util } // namespace util
} // namespace agi } // namespace agi

4
aegisub/libaegisub/unix/util.cpp
View file

@ -55,5 +55,9 @@ void Rename(const std::string& from, const std::string& to) {
rename(from.c_str(), to.c_str()); rename(from.c_str(), to.c_str());
} }
void time_log(timeval &tv) {
gettimeofday(&tv, (struct timezone *)NULL);
}
} // namespace io } // namespace io
} // namespace agi } // namespace agi