diff options
author | wm4 <wm4@nowhere> | 2012-11-05 17:02:04 +0100 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2012-11-12 20:06:14 +0100 |
commit | d4bdd0473d6f43132257c9fb3848d829755167a3 (patch) | |
tree | 8021c2f7da1841393c8c832105e20cd527826d6c /bstr.h | |
parent | bd48deba77bd5582c5829d6fe73a7d2571088aba (diff) | |
download | mpv-d4bdd0473d6f43132257c9fb3848d829755167a3.tar.bz2 mpv-d4bdd0473d6f43132257c9fb3848d829755167a3.tar.xz |
Rename directories, move files (step 1 of 2) (does not compile)
Tis drops the silly lib prefixes, and attempts to organize the tree in
a more logical way. Make the top-level directory less cluttered as
well.
Renames the following directories:
libaf -> audio/filter
libao2 -> audio/out
libvo -> video/out
libmpdemux -> demux
Split libmpcodecs:
vf* -> video/filter
vd*, dec_video.* -> video/decode
mp_image*, img_format*, ... -> video/
ad*, dec_audio.* -> audio/decode
libaf/format.* is moved to audio/ - this is similar to how mp_image.*
is located in video/.
Move most top-level .c/.h files to core. (talloc.c/.h is left on top-
level, because it's external.) Park some of the more annoying files
in compat/. Some of these are relicts from the time mplayer used
ffmpeg internals.
sub/ is not split, because it's too much of a mess (subtitle code is
mixed with OSD display and rendering).
Maybe the organization of core is not ideal: it mixes playback core
(like mplayer.c) and utility helpers (like bstr.c/h). Should the need
arise, the playback core will be moved somewhere else, while core
contains all helper and common code.
Diffstat (limited to 'bstr.h')
-rw-r--r-- | bstr.h | 175 |
1 files changed, 0 insertions, 175 deletions
diff --git a/bstr.h b/bstr.h deleted file mode 100644 index dfe6f3a556..0000000000 --- a/bstr.h +++ /dev/null @@ -1,175 +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_BSTR_H -#define MPLAYER_BSTR_H - -#include <stdint.h> -#include <stddef.h> -#include <string.h> -#include <stdbool.h> - -#include "talloc.h" - -/* NOTE: 'len' is size_t, but most string-handling functions below assume - * that input size has been sanity checked and len fits in an int. - */ -typedef struct bstr { - unsigned char *start; - size_t len; -} bstr; - -// If str.start is NULL, return NULL. -static inline char *bstrdup0(void *talloc_ctx, struct bstr str) -{ - return talloc_strndup(talloc_ctx, (char *)str.start, str.len); -} - -// Return start = NULL iff that is true for the original. -static inline struct bstr bstrdup(void *talloc_ctx, struct bstr str) -{ - struct bstr r = { NULL, str.len }; - if (str.start) - r.start = (unsigned char *)talloc_memdup(talloc_ctx, str.start, str.len); - return r; -} - -static inline struct bstr bstr0(const char *s) -{ - return (struct bstr){(unsigned char *)s, s ? strlen(s) : 0}; -} - -int bstrcmp(struct bstr str1, struct bstr str2); -int bstrcasecmp(struct bstr str1, struct bstr str2); -int bstrchr(struct bstr str, int c); -int bstrrchr(struct bstr str, int c); -int bstrcspn(struct bstr str, const char *reject); - -int bstr_find(struct bstr haystack, struct bstr needle); -struct bstr *bstr_splitlines(void *talloc_ctx, struct bstr str); -struct bstr bstr_lstrip(struct bstr str); -struct bstr bstr_strip(struct bstr str); -struct bstr bstr_split(struct bstr str, const char *sep, struct bstr *rest); -struct bstr bstr_splice(struct bstr str, int start, int end); -long long bstrtoll(struct bstr str, struct bstr *rest, int base); -double bstrtod(struct bstr str, struct bstr *rest); -void bstr_lower(struct bstr str); -int bstr_sscanf(struct bstr str, const char *format, ...); - -// Decode the UTF-8 code point at the start of the string,, and return the -// character. -// After calling this function, *out_next will point to the next character. -// out_next can be NULL. -// On error, -1 is returned, and *out_next is not modified. -int bstr_decode_utf8(struct bstr str, struct bstr *out_next); - -// Return the length of the UTF-8 sequence that starts with the given byte. -// Given a string char *s, the next UTF-8 code point is to be expected at -// s + bstr_parse_utf8_code_length(s[0]) -// On error, -1 is returned. On success, it returns a value in the range [1, 4]. -int bstr_parse_utf8_code_length(unsigned char b); - -// Return the text before the next line break, and return it. Change *rest to -// point to the text following this line break. (rest can be NULL.) -// Line break characters are not stripped. -struct bstr bstr_getline(struct bstr str, struct bstr *rest); - -// Strip one trailing line break. This is intended for use with bstr_getline, -// and will remove the trailing \n or \r\n sequence. -struct bstr bstr_strip_linebreaks(struct bstr str); - -// If s starts with prefix, return true and return the rest of the string in s. -bool bstr_eatstart(struct bstr *s, struct bstr prefix); - -bool bstr_case_startswith(struct bstr s, struct bstr prefix); -bool bstr_case_endswith(struct bstr s, struct bstr suffix); -struct bstr bstr_strip_ext(struct bstr str); -struct bstr bstr_get_ext(struct bstr s); - -static inline struct bstr bstr_cut(struct bstr str, int n) -{ - if (n < 0) { - n += str.len; - if (n < 0) - n = 0; - } - if (((size_t)n) > str.len) - n = str.len; - return (struct bstr){str.start + n, str.len - n}; -} - -static inline bool bstr_startswith(struct bstr str, struct bstr prefix) -{ - if (str.len < prefix.len) - return false; - return !memcmp(str.start, prefix.start, prefix.len); -} - -static inline bool bstr_startswith0(struct bstr str, const char *prefix) -{ - return bstr_startswith(str, bstr0(prefix)); -} - -static inline bool bstr_endswith(struct bstr str, struct bstr suffix) -{ - if (str.len < suffix.len) - return false; - return !memcmp(str.start + str.len - suffix.len, suffix.start, suffix.len); -} - -static inline bool bstr_endswith0(struct bstr str, const char *suffix) -{ - return bstr_endswith(str, bstr0(suffix)); -} - -static inline int bstrcmp0(struct bstr str1, const char *str2) -{ - return bstrcmp(str1, bstr0(str2)); -} - -static inline bool bstr_equals(struct bstr str1, struct bstr str2) -{ - return bstrcmp(str1, str2) == 0; -} - -static inline bool bstr_equals0(struct bstr str1, const char *str2) -{ - return bstrcmp(str1, bstr0(str2)) == 0; -} - -static inline int bstrcasecmp0(struct bstr str1, const char *str2) -{ - return bstrcasecmp(str1, bstr0(str2)); -} - -static inline int bstr_find0(struct bstr haystack, const char *needle) -{ - return bstr_find(haystack, bstr0(needle)); -} - -static inline int bstr_eatstart0(struct bstr *s, const char *prefix) -{ - return bstr_eatstart(s, bstr0(prefix)); -} - -// create a pair (not single value!) for "%.*s" printf syntax -#define BSTR_P(bstr) (int)((bstr).len), (bstr).start - -#define WHITESPACE " \f\n\r\t\v" - -#endif /* MPLAYER_BSTR_H */ |