projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Stub player.
[dcpomatic.git]
/
src
/
lib
/
cross.h
diff --git
a/src/lib/cross.h
b/src/lib/cross.h
index c206fa55dbf3064cf17bcf68e719a45bb1765e2d..8c1df998b56dec3ccdfd8758fa0262a4a76f1fa4 100644
(file)
--- a/
src/lib/cross.h
+++ b/
src/lib/cross.h
@@
-1,19
+1,20
@@
/*
/*
- Copyright (C) 2012-201
4
Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2012-201
5
Carl Hetherington <cth@carlh.net>
- This program is free software; you can redistribute it and/or modify
+ This file is part of DCP-o-matic.
+
+ DCP-o-matic is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
-
This program
is distributed in the hope that it will be useful,
+
DCP-o-matic
is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ along with DCP-o-matic. If not, see <http://www.gnu.org/licenses/>.
*/
*/
@@
-24,16
+25,17
@@
#ifndef DCPOMATIC_CROSS_H
#define DCPOMATIC_CROSS_H
#ifndef DCPOMATIC_CROSS_H
#define DCPOMATIC_CROSS_H
-#include <boost/filesystem.hpp>
#ifdef DCPOMATIC_OSX
#include <IOKit/pwr_mgt/IOPMLib.h>
#endif
#ifdef DCPOMATIC_OSX
#include <IOKit/pwr_mgt/IOPMLib.h>
#endif
+#include <boost/filesystem.hpp>
#ifdef DCPOMATIC_WINDOWS
#define WEXITSTATUS(w) (w)
#endif
class Log;
#ifdef DCPOMATIC_WINDOWS
#define WEXITSTATUS(w) (w)
#endif
class Log;
+struct AVIOContext;
void dcpomatic_sleep (int);
extern std::string cpu_info ();
void dcpomatic_sleep (int);
extern std::string cpu_info ();
@@
-43,13
+45,20
@@
extern boost::filesystem::path openssl_path ();
#ifdef DCPOMATIC_OSX
extern boost::filesystem::path app_contents ();
#endif
#ifdef DCPOMATIC_OSX
extern boost::filesystem::path app_contents ();
#endif
+#ifdef DCPOMATIC_WINDOWS
+extern void maybe_open_console ();
+#endif
+extern boost::filesystem::path shared_path ();
extern FILE * fopen_boost (boost::filesystem::path, std::string);
extern int dcpomatic_fseek (FILE *, int64_t, int);
extern FILE * fopen_boost (boost::filesystem::path, std::string);
extern int dcpomatic_fseek (FILE *, int64_t, int);
+extern void start_batch_converter (boost::filesystem::path dcpomatic);
+extern uint64_t thread_id ();
+extern int avio_open_boost (AVIOContext** s, boost::filesystem::path file, int flags);
/** @class Waker
* @brief A class which tries to keep the computer awake on various operating systems.
*
/** @class Waker
* @brief A class which tries to keep the computer awake on various operating systems.
*
- * Create a Waker to prevent sleep, and call
::nudge
every so often (every minute or so).
+ * Create a Waker to prevent sleep, and call
nudge()
every so often (every minute or so).
* Destroy the Waker to allow sleep again.
*/
class Waker
* Destroy the Waker to allow sleep again.
*/
class Waker