summaryrefslogtreecommitdiffstats
path: root/core/mp_common.h
diff options
context:
space:
mode:
authorStefano Pigozzi <stefano.pigozzi@gmail.com>2013-08-06 22:34:12 +0200
committerStefano Pigozzi <stefano.pigozzi@gmail.com>2013-08-06 22:48:47 +0200
commitbc27f946c27e33933a3a696cade78a04902c8dce (patch)
tree0e4166ba66072d407d0b972842b08cb7fea6f50b /core/mp_common.h
parentd40a91e804e19fb32430c5a80a984f5148324f52 (diff)
downloadmpv-bc27f946c27e33933a3a696cade78a04902c8dce.tar.bz2
mpv-bc27f946c27e33933a3a696cade78a04902c8dce.tar.xz
core: move contents to mpvcore (1/2)
core is used in many unix systems for core dumps. For that reason some tools work under the assumption that the file is indeed a core dump (for example autoconf does this). This commit just renames the files. The following one will change all the includes to fix compilation. This is done this way because git has a easier time tracing file changes if there is a pure rename commit.
Diffstat (limited to 'core/mp_common.h')
-rw-r--r--core/mp_common.h66
1 files changed, 0 insertions, 66 deletions
diff --git a/core/mp_common.h b/core/mp_common.h
deleted file mode 100644
index 71e24604ec..0000000000
--- a/core/mp_common.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * This file is part of MPlayer.
- *
- * MPlayer 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.
- *
- * MPlayer 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 along
- * with MPlayer; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-#ifndef MPLAYER_MPCOMMON_H
-#define MPLAYER_MPCOMMON_H
-
-#include <stdlib.h>
-#include <stdbool.h>
-#include <stdint.h>
-
-#include "compat/compiler.h"
-#include "core/mp_talloc.h"
-
-// both int64_t and double should be able to represent this exactly
-#define MP_NOPTS_VALUE (-1LL<<63)
-
-#define MP_CONCAT_(a, b) a ## b
-#define MP_CONCAT(a, b) MP_CONCAT_(a, b)
-
-#define ROUND(x) ((int)((x) < 0 ? (x) - 0.5 : (x) + 0.5))
-
-#define MPMAX(a, b) ((a) > (b) ? (a) : (b))
-#define MPMIN(a, b) ((a) > (b) ? (b) : (a))
-#define MP_ARRAY_SIZE(s) (sizeof(s) / sizeof((s)[0]))
-
-#define CONTROL_OK 1
-#define CONTROL_TRUE 1
-#define CONTROL_FALSE 0
-#define CONTROL_UNKNOWN -1
-#define CONTROL_ERROR -2
-#define CONTROL_NA -3
-
-extern const char *mplayer_version;
-extern const char *mplayer_builddate;
-
-char *mp_format_time(double time, bool fractions);
-
-struct mp_rect {
- int x0, y0;
- int x1, y1;
-};
-
-void mp_rect_union(struct mp_rect *rc, const struct mp_rect *src);
-bool mp_rect_intersection(struct mp_rect *rc, const struct mp_rect *rc2);
-
-char *mp_append_utf8_buffer(char *buffer, uint32_t codepoint);
-
-struct bstr;
-bool mp_parse_escape(struct bstr *code, char **str);
-
-#endif /* MPLAYER_MPCOMMON_H */