From e9ded173f1d14f409c8fa15f52765c216264daec Mon Sep 17 00:00:00 2001 From: jp9000 Date: Wed, 25 Dec 2013 22:40:33 -0700 Subject: [PATCH] add my signal/callback interface from another project, also update license of utility files to ISC 1.3 --- libobs/callback/calldata.c | 268 ++++++++++++++++++++++++ libobs/callback/calldata.h | 283 ++++++++++++++++++++++++++ libobs/callback/proc.c | 17 ++ libobs/callback/proc.h | 41 ++++ libobs/callback/signal.c | 17 ++ libobs/callback/signal.h | 42 ++++ libobs/util/AlignedNew.hpp | 37 ++-- libobs/util/base.c | 37 ++-- libobs/util/base.h | 37 ++-- libobs/util/bmem.c | 37 ++-- libobs/util/bmem.h | 37 ++-- libobs/util/c99defs.h | 37 ++-- libobs/util/cf-lexer.c | 37 ++-- libobs/util/cf-lexer.h | 37 ++-- libobs/util/cf-parser.c | 37 ++-- libobs/util/cf-parser.h | 37 ++-- libobs/util/circlebuf.h | 37 ++-- libobs/util/config-file.c | 37 ++-- libobs/util/config-file.h | 37 ++-- libobs/util/darray.h | 37 ++-- libobs/util/dstr.c | 37 ++-- libobs/util/dstr.h | 37 ++-- libobs/util/lexer.c | 37 ++-- libobs/util/lexer.h | 37 ++-- libobs/util/platform-cocoa.m | 37 ++-- libobs/util/platform-nix.c | 37 ++-- libobs/util/platform-windows.c | 37 ++-- libobs/util/platform.c | 37 ++-- libobs/util/platform.h | 37 ++-- libobs/util/serializer.h | 37 ++-- libobs/util/text-lookup.c | 37 ++-- libobs/util/text-lookup.h | 37 ++-- libobs/util/threading.h | 37 ++-- libobs/util/util.hpp | 31 ++- libobs/util/windows/ComPtr.hpp | 37 ++-- libobs/util/windows/HRError.hpp | 37 ++-- vs/2013/libobs/libobs.vcxproj | 2 + vs/2013/libobs/libobs.vcxproj.filters | 15 ++ 38 files changed, 1135 insertions(+), 654 deletions(-) create mode 100644 libobs/callback/calldata.c create mode 100644 libobs/callback/calldata.h create mode 100644 libobs/callback/proc.c create mode 100644 libobs/callback/proc.h create mode 100644 libobs/callback/signal.c create mode 100644 libobs/callback/signal.h diff --git a/libobs/callback/calldata.c b/libobs/callback/calldata.c new file mode 100644 index 000000000..dbbad065a --- /dev/null +++ b/libobs/callback/calldata.c @@ -0,0 +1,268 @@ +/* + * Copyright (c) 2013 Hugh Bailey + * + * Permission to use, copy, modify, and distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + */ + +#include + +#include "../util/bmem.h" + +#include "calldata.h" + +/* + * Uses a data stack. Probably more complex than it should be, but reduces + * cache fetching. + * + * Stack format is: + * [size_t param1_name_size] + * [char[] param1_name] + * [size_t param1_data_size] + * [uint8_t[] param1_data] + * [size_t param2_name_size] + * [char[] param2_name] + * [size_t param2_data_size] + * [uint8_t[] param2_data] + * [...] + * + * Strings and string sizes always include the null terminator to allow for + * direct referencing. + */ + +struct calldata { + size_t size; /* size of the stack, in bytes */ + size_t capacity; /* capacity of the stack, in bytes */ + uint8_t *stack; +}; + +static inline void cd_serialize(uint8_t **pos, void *ptr, size_t size) +{ + memcpy(ptr, *pos, size); + *pos += size; +} + +static inline size_t cd_serialize_size(uint8_t **pos) +{ + size_t size = *(size_t*)*pos; + *pos += sizeof(size_t); + return size; +} + +static inline const char *cd_serialize_string(uint8_t **pos) +{ + size_t size = cd_serialize_size(pos); + const char *str = *pos; + + *pos += size; + + return (size != 0) ? str : NULL; +} + +static bool cd_getparam(calldata_t data, const char *name, + uint8_t **pos) +{ + size_t name_size; + + if (!data->size) + return false; + + *pos = data->stack; + + name_size = cd_serialize_size(pos); + while (name_size != 0) { + const char *param_name = *pos; + size_t param_size; + + *pos += name_size; + if (strcmp(param_name, name) == 0) + return true; + + param_size = cd_serialize_size(pos); + *pos += param_size; + + name_size = cd_serialize_size(pos); + } + + *pos -= sizeof(size_t); + return false; +} + +static inline void cd_copy_string(uint8_t **pos, const char *str, size_t len) +{ + if (!len) + len = strlen(str)+1; + + *(size_t*)*pos = len; + *pos += sizeof(size_t); + memcpy(*pos, str, len); + *pos += len; +} + +static inline void cd_copy_data(uint8_t **pos, const void *in, size_t size) +{ + *(size_t*)*pos = size; + *pos += sizeof(size_t); + + if (size) { + memcpy(*pos, in, size); + *pos += size; + } +} + +static inline void cd_set_first_param(calldata_t data, const char *name, + const void *in, size_t size) +{ + uint8_t *pos; + size_t capacity; + size_t name_len = strlen(name)+1; + + capacity = sizeof(size_t)*3 + name_len + size; + data->size = capacity; + + if (capacity < 128) + capacity = 128; + + data->capacity = capacity; + data->stack = bmalloc(capacity); + + pos = data->stack; + cd_copy_string(&pos, name, name_len); + cd_copy_data(&pos, in, size); + *(size_t*)pos = 0; +} + +static inline void cd_ensure_capacity(calldata_t data, uint8_t **pos, + size_t new_size) +{ + size_t offset; + size_t new_capacity; + + if (new_size < data->capacity) + return; + + offset = *pos - data->stack; + + new_capacity = data->capacity * 2; + if (new_capacity < new_size) + new_capacity = new_size; + + data->stack = brealloc(data->stack, new_capacity); + data->capacity = new_capacity; + + *pos = data->stack + offset; +} + +/* ------------------------------------------------------------------------- */ + +calldata_t calldata_create(void) +{ + struct calldata *data = bmalloc(sizeof(struct calldata)); + memset(data, 0, sizeof(struct calldata)); + return data; +} + +void calldata_destroy(calldata_t data) +{ + if (data) { + bfree(data->stack); + bfree(data); + } +} + +/* ------------------------------------------------------------------------- */ + +bool calldata_getdata(calldata_t data, const char *name, void *out, size_t size) +{ + uint8_t *pos; + size_t data_size; + + if (!name || !*name) + return false; + + if (!cd_getparam(data, name, &pos)) + return false; + + data_size = cd_serialize_size(&pos); + if (data_size != size) + return false; + + memcpy(out, pos, size); + return true; +} + +void calldata_setdata(calldata_t data, const char *name, const void *in, + size_t size) +{ + uint8_t *pos; + + if (!name || !*name) + return; + + if (!data->stack) { + cd_set_first_param(data, name, in, size); + return; + } + + if (cd_getparam(data, name, &pos)) { + size_t cur_size = *(size_t*)pos; + + if (cur_size < size) { + size_t offset = size - cur_size; + size_t bytes = data->size; + + cd_ensure_capacity(data, &pos, bytes + offset); + memmove(pos+offset, pos, bytes - (pos - data->stack)); + data->size += offset; + + } else if (cur_size > size) { + size_t offset = cur_size - size; + size_t bytes = data->size - offset; + + memmove(pos, pos+offset, bytes - (pos - data->stack)); + data->size -= offset; + } + + cd_copy_data(&pos, in, size); + + } else { + size_t name_len = strlen(name)+1; + size_t offset = name_len + size + sizeof(size_t)*2; + cd_ensure_capacity(data, &pos, data->size + offset); + data->size += offset; + + cd_copy_string(&pos, name, 0); + cd_copy_data(&pos, in, size); + *(size_t*)pos = 0; + } +} + +void calldata_clear(calldata_t data) +{ + if (data->size) { + data->size = sizeof(size_t); + *(size_t*)data->stack = 0; + } +} + +bool calldata_getstring(calldata_t data, const char *name, const char **str) +{ + uint8_t *pos; + if (!name || !*name) + return false; + + if (!cd_getparam(data, name, &pos)) + return false; + + *str = cd_serialize_string(&pos); + return true; +} diff --git a/libobs/callback/calldata.h b/libobs/callback/calldata.h new file mode 100644 index 000000000..d144680dd --- /dev/null +++ b/libobs/callback/calldata.h @@ -0,0 +1,283 @@ +/* + * Copyright (c) 2013 Hugh Bailey + * + * Permission to use, copy, modify, and distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + */ + +#pragma once + +#include +#include "../util/c99defs.h" + +#ifdef __cplusplus +extern "C" { +#endif + +/* + * Procedure call data structure + * + * This is used to store parameters (and return value) sent to/from signals, + * procedures, and callbacks. + */ + +struct calldata; +typedef struct calldata *calldata_t; + +EXPORT calldata_t calldata_create(void); +EXPORT void calldata_destroy(calldata_t data); + +/* NOTE: 'get' functions return true only if paramter exists, and is the + * same size. They return false otherwise. */ + +EXPORT bool calldata_getdata(calldata_t data, const char *name, void *out, + size_t size); +EXPORT void calldata_setdata(calldata_t data, const char *name, const void *in, + size_t new_size); + +EXPORT void calldata_clear(calldata_t data); + +inline bool calldata_getchar (calldata_t data, const char *name, char *val) +{ + return calldata_getdata(data, name, val, sizeof(*val)); +} + +inline bool calldata_getuchar (calldata_t data, const char *name, + unsigned char *val) +{ + return calldata_getdata(data, name, val, sizeof(*val)); +} + +inline bool calldata_getshort (calldata_t data, const char *name, short *val) +{ + return calldata_getdata(data, name, val, sizeof(*val)); +} + +inline bool calldata_getushort(calldata_t data, const char *name, + unsigned short *val) +{ + return calldata_getdata(data, name, val, sizeof(*val)); +} + +inline bool calldata_getint (calldata_t data, const char *name, int *val) +{ + return calldata_getdata(data, name, val, sizeof(*val)); +} + +inline bool calldata_getuint (calldata_t data, const char *name, + unsigned int *val) +{ + return calldata_getdata(data, name, val, sizeof(*val)); +} + +inline bool calldata_getlong (calldata_t data, const char *name, long *val) +{ + return calldata_getdata(data, name, val, sizeof(*val)); +} + +inline bool calldata_getulong (calldata_t data, const char *name, + unsigned long *val) +{ + return calldata_getdata(data, name, val, sizeof(*val)); +} + +inline bool calldata_getint8 (calldata_t data, const char *name, int8_t *val) +{ + return calldata_getdata(data, name, val, sizeof(*val)); +} + +inline bool calldata_getuint8 (calldata_t data, const char *name, uint8_t *val) +{ + return calldata_getdata(data, name, val, sizeof(*val)); +} + +inline bool calldata_getint16 (calldata_t data, const char *name, int8_t *val) +{ + return calldata_getdata(data, name, val, sizeof(*val)); +} + +inline bool calldata_getuint16(calldata_t data, const char *name, uint8_t *val) +{ + return calldata_getdata(data, name, val, sizeof(*val)); +} + +inline bool calldata_getint32 (calldata_t data, const char *name, int32_t *val) +{ + return calldata_getdata(data, name, val, sizeof(*val)); +} + +inline bool calldata_getuint32(calldata_t data, const char *name, uint32_t *val) +{ + return calldata_getdata(data, name, val, sizeof(*val)); +} + +inline bool calldata_getint64 (calldata_t data, const char *name, int64_t *val) +{ + return calldata_getdata(data, name, val, sizeof(*val)); +} + +inline bool calldata_getuint64(calldata_t data, const char *name, uint64_t *val) +{ + return calldata_getdata(data, name, val, sizeof(*val)); +} + +inline bool calldata_getfloat (calldata_t data, const char *name, long *val) +{ + return calldata_getdata(data, name, val, sizeof(*val)); +} + +inline bool calldata_getdouble(calldata_t data, const char *name, long *val) +{ + return calldata_getdata(data, name, val, sizeof(*val)); +} + +inline bool calldata_getbool (calldata_t data, const char *name, bool *val) +{ + return calldata_getdata(data, name, val, sizeof(*val)); +} + +inline bool calldata_getsize (calldata_t data, const char *name, size_t *val) +{ + return calldata_getdata(data, name, val, sizeof(*val)); +} + +inline bool calldata_getptr (calldata_t data, const char *name, void **ptr) +{ + return calldata_getdata(data, name, ptr, sizeof(*ptr)); +} + +EXPORT bool calldata_getstring(calldata_t data, const char *name, + const char **str); + +/* ------------------------------------------------------------------------- */ + +void calldata_setchar (calldata_t data, const char *name, char val) +{ + calldata_setdata(data, name, &val, sizeof(val)); +} + +inline void calldata_setuchar (calldata_t data, const char *name, + unsigned char val) +{ + calldata_setdata(data, name, &val, sizeof(val)); +} + +inline void calldata_setshort (calldata_t data, const char *name, short val) +{ + calldata_setdata(data, name, &val, sizeof(val)); +} + +inline void calldata_setushort(calldata_t data, const char *name, + unsigned short val) +{ + calldata_setdata(data, name, &val, sizeof(val)); +} + +inline void calldata_setint (calldata_t data, const char *name, int val) +{ + calldata_setdata(data, name, &val, sizeof(val)); +} + +inline void calldata_setuint (calldata_t data, const char *name, + unsigned int val) +{ + calldata_setdata(data, name, &val, sizeof(val)); +} + +inline void calldata_setlong (calldata_t data, const char *name, long val) +{ + calldata_setdata(data, name, &val, sizeof(val)); +} + +inline void calldata_setulong (calldata_t data, const char *name, + unsigned long val) +{ + calldata_setdata(data, name, &val, sizeof(val)); +} + +inline void calldata_setint8 (calldata_t data, const char *name, int8_t val) +{ + calldata_setdata(data, name, &val, sizeof(val)); +} + +inline void calldata_setuint8 (calldata_t data, const char *name, uint8_t val) +{ + calldata_setdata(data, name, &val, sizeof(val)); +} + +inline void calldata_setint16 (calldata_t data, const char *name, int8_t val) +{ + calldata_setdata(data, name, &val, sizeof(val)); +} + +inline void calldata_setuint16(calldata_t data, const char *name, uint8_t val) +{ + calldata_setdata(data, name, &val, sizeof(val)); +} + +inline void calldata_setint32 (calldata_t data, const char *name, int32_t val) +{ + calldata_setdata(data, name, &val, sizeof(val)); +} + +inline void calldata_setuint32(calldata_t data, const char *name, uint32_t val) +{ + calldata_setdata(data, name, &val, sizeof(val)); +} + +inline void calldata_setint64 (calldata_t data, const char *name, int64_t val) +{ + calldata_setdata(data, name, &val, sizeof(val)); +} + +inline void calldata_setuint64(calldata_t data, const char *name, uint64_t val) +{ + calldata_setdata(data, name, &val, sizeof(val)); +} + +inline void calldata_setfloat (calldata_t data, const char *name, long val) +{ + calldata_setdata(data, name, &val, sizeof(val)); +} + +inline void calldata_setdouble(calldata_t data, const char *name, long val) +{ + calldata_setdata(data, name, &val, sizeof(val)); +} + +inline void calldata_setbool (calldata_t data, const char *name, bool val) +{ + calldata_setdata(data, name, &val, sizeof(val)); +} + +inline void calldata_setsize (calldata_t data, const char *name, size_t val) +{ + calldata_setdata(data, name, &val, sizeof(val)); +} + +inline void calldata_setptr (calldata_t data, const char *name, void *ptr) +{ + calldata_setdata(data, name, &ptr, sizeof(ptr)); +} + +inline void calldata_setstring(calldata_t data, const char *name, + const char *str) +{ + if (str) + calldata_setdata(data, name, str, strlen(str)+1); + else + calldata_setdata(data, name, NULL, 0); +} + +#ifdef __cplusplus +} +#endif diff --git a/libobs/callback/proc.c b/libobs/callback/proc.c new file mode 100644 index 000000000..b78ccae66 --- /dev/null +++ b/libobs/callback/proc.c @@ -0,0 +1,17 @@ +/* + * Copyright (c) 2013 Hugh Bailey + * + * Permission to use, copy, modify, and distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + */ + + diff --git a/libobs/callback/proc.h b/libobs/callback/proc.h new file mode 100644 index 000000000..9ca2c8695 --- /dev/null +++ b/libobs/callback/proc.h @@ -0,0 +1,41 @@ +/* + * Copyright (c) 2013 Hugh Bailey + * + * Permission to use, copy, modify, and distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + */ + +#pragma once + +#include "../util/c99defs.h" + +#include "calldata.h" + +/* + * Dynamic procedure handler + * + * This handler is used to allow dynamic access to one or more procedures + * that can be called without having to have direct access to declarations + * or procedure callback pointers. + */ + +struct proc_handler; +typedef struct proc_handler *proc_handler_t; + +proc_handler_t proc_handler_create(void *data); +void proc_handler_destroy(proc_handler_t handler); + +void proc_handler_add(proc_handler_t handler, const char *declaration, + void (*proc)(calldata_t, void*)); + +bool proc_handler_call(proc_handler_t handler, const char *name, + calldata_t params); diff --git a/libobs/callback/signal.c b/libobs/callback/signal.c new file mode 100644 index 000000000..b78ccae66 --- /dev/null +++ b/libobs/callback/signal.c @@ -0,0 +1,17 @@ +/* + * Copyright (c) 2013 Hugh Bailey + * + * Permission to use, copy, modify, and distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + */ + + diff --git a/libobs/callback/signal.h b/libobs/callback/signal.h new file mode 100644 index 000000000..dd1900c6a --- /dev/null +++ b/libobs/callback/signal.h @@ -0,0 +1,42 @@ +/* + * Copyright (c) 2013 Hugh Bailey + * + * Permission to use, copy, modify, and distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + */ + +#pragma once + +#include "../util/c99defs.h" + +#include "calldata.h" + +/* + * Signal handler + * + * This is used to create a signal handler which can broadcast events + * to one or more callbacks connected to a signal. + */ + +struct signal_handler; +typedef struct signal_handler *signal_handler_t; + +signal_handler_t signal_handler_create(void); +void signal_handler_destroy(signal_handler_t handler); + +void signal_handler_connect(signal_handler_t handler, const char *signal, + void (*callback)(calldata_t, void*), void *param); +void signal_handler_disconnect(signal_handler_t handler, const char *signal, + void (*callback)(calldata_t. void*), void *param); + +void signal_handler_signal(signal_handler_t handler, const char *name, + calldata_t params); diff --git a/libobs/util/AlignedNew.hpp b/libobs/util/AlignedNew.hpp index 6f058bee0..124848877 100644 --- a/libobs/util/AlignedNew.hpp +++ b/libobs/util/AlignedNew.hpp @@ -1,25 +1,18 @@ -/****************************************************************************** - Copyright (c) 2013 by Hugh Bailey - - This software is provided 'as-is', without any express or implied - warranty. In no event will the authors be held liable for any damages - arising from the use of this software. - - Permission is granted to anyone to use this software for any purpose, - including commercial applications, and to alter it and redistribute it - freely, subject to the following restrictions: - - 1. The origin of this software must not be misrepresented; you must not - claim that you wrote the original software. If you use this software - in a product, an acknowledgment in the product documentation would be - appreciated but is not required. - - 2. Altered source versions must be plainly marked as such, and must not be - misrepresented as being the original software. - - 3. This notice may not be removed or altered from any source - distribution. -******************************************************************************/ +/* + * Copyright (c) 2013 Hugh Bailey + * + * Permission to use, copy, modify, and distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + */ #pragma once diff --git a/libobs/util/base.c b/libobs/util/base.c index b60cd590b..6743442ac 100644 --- a/libobs/util/base.c +++ b/libobs/util/base.c @@ -1,25 +1,18 @@ -/****************************************************************************** - Copyright (c) 2013 by Hugh Bailey - - This software is provided 'as-is', without any express or implied - warranty. In no event will the authors be held liable for any damages - arising from the use of this software. - - Permission is granted to anyone to use this software for any purpose, - including commercial applications, and to alter it and redistribute it - freely, subject to the following restrictions: - - 1. The origin of this software must not be misrepresented; you must not - claim that you wrote the original software. If you use this software - in a product, an acknowledgment in the product documentation would be - appreciated but is not required. - - 2. Altered source versions must be plainly marked as such, and must not be - misrepresented as being the original software. - - 3. This notice may not be removed or altered from any source - distribution. -******************************************************************************/ +/* + * Copyright (c) 2013 Hugh Bailey + * + * Permission to use, copy, modify, and distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + */ #include #include diff --git a/libobs/util/base.h b/libobs/util/base.h index 715a9010a..f3b8006f1 100644 --- a/libobs/util/base.h +++ b/libobs/util/base.h @@ -1,25 +1,18 @@ -/****************************************************************************** - Copyright (c) 2013 by Hugh Bailey - - This software is provided 'as-is', without any express or implied - warranty. In no event will the authors be held liable for any damages - arising from the use of this software. - - Permission is granted to anyone to use this software for any purpose, - including commercial applications, and to alter it and redistribute it - freely, subject to the following restrictions: - - 1. The origin of this software must not be misrepresented; you must not - claim that you wrote the original software. If you use this software - in a product, an acknowledgment in the product documentation would be - appreciated but is not required. - - 2. Altered source versions must be plainly marked as such, and must not be - misrepresented as being the original software. - - 3. This notice may not be removed or altered from any source - distribution. -******************************************************************************/ +/* + * Copyright (c) 2013 Hugh Bailey + * + * Permission to use, copy, modify, and distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + */ #pragma once diff --git a/libobs/util/bmem.c b/libobs/util/bmem.c index 248ef9f7d..0c4c560dc 100644 --- a/libobs/util/bmem.c +++ b/libobs/util/bmem.c @@ -1,25 +1,18 @@ -/****************************************************************************** - Copyright (c) 2013 by Hugh Bailey - - This software is provided 'as-is', without any express or implied - warranty. In no event will the authors be held liable for any damages - arising from the use of this software. - - Permission is granted to anyone to use this software for any purpose, - including commercial applications, and to alter it and redistribute it - freely, subject to the following restrictions: - - 1. The origin of this software must not be misrepresented; you must not - claim that you wrote the original software. If you use this software - in a product, an acknowledgment in the product documentation would be - appreciated but is not required. - - 2. Altered source versions must be plainly marked as such, and must not be - misrepresented as being the original software. - - 3. This notice may not be removed or altered from any source - distribution. -******************************************************************************/ +/* + * Copyright (c) 2013 Hugh Bailey + * + * Permission to use, copy, modify, and distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + */ #include #include diff --git a/libobs/util/bmem.h b/libobs/util/bmem.h index 8683d12bf..d2e11b095 100644 --- a/libobs/util/bmem.h +++ b/libobs/util/bmem.h @@ -1,25 +1,18 @@ -/****************************************************************************** - Copyright (c) 2013 by Hugh Bailey - - This software is provided 'as-is', without any express or implied - warranty. In no event will the authors be held liable for any damages - arising from the use of this software. - - Permission is granted to anyone to use this software for any purpose, - including commercial applications, and to alter it and redistribute it - freely, subject to the following restrictions: - - 1. The origin of this software must not be misrepresented; you must not - claim that you wrote the original software. If you use this software - in a product, an acknowledgment in the product documentation would be - appreciated but is not required. - - 2. Altered source versions must be plainly marked as such, and must not be - misrepresented as being the original software. - - 3. This notice may not be removed or altered from any source - distribution. -******************************************************************************/ +/* + * Copyright (c) 2013 Hugh Bailey + * + * Permission to use, copy, modify, and distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + */ #pragma once diff --git a/libobs/util/c99defs.h b/libobs/util/c99defs.h index 605db39e5..46e29e4fb 100644 --- a/libobs/util/c99defs.h +++ b/libobs/util/c99defs.h @@ -1,25 +1,18 @@ -/****************************************************************************** - Copyright (c) 2013 by Hugh Bailey - - This software is provided 'as-is', without any express or implied - warranty. In no event will the authors be held liable for any damages - arising from the use of this software. - - Permission is granted to anyone to use this software for any purpose, - including commercial applications, and to alter it and redistribute it - freely, subject to the following restrictions: - - 1. The origin of this software must not be misrepresented; you must not - claim that you wrote the original software. If you use this software - in a product, an acknowledgment in the product documentation would be - appreciated but is not required. - - 2. Altered source versions must be plainly marked as such, and must not be - misrepresented as being the original software. - - 3. This notice may not be removed or altered from any source - distribution. -******************************************************************************/ +/* + * Copyright (c) 2013 Hugh Bailey + * + * Permission to use, copy, modify, and distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + */ #pragma once diff --git a/libobs/util/cf-lexer.c b/libobs/util/cf-lexer.c index a524a3bf5..88a43547c 100644 --- a/libobs/util/cf-lexer.c +++ b/libobs/util/cf-lexer.c @@ -1,25 +1,18 @@ -/****************************************************************************** - Copyright (c) 2013 by Hugh Bailey - - This software is provided 'as-is', without any express or implied - warranty. In no event will the authors be held liable for any damages - arising from the use of this software. - - Permission is granted to anyone to use this software for any purpose, - including commercial applications, and to alter it and redistribute it - freely, subject to the following restrictions: - - 1. The origin of this software must not be misrepresented; you must not - claim that you wrote the original software. If you use this software - in a product, an acknowledgment in the product documentation would be - appreciated but is not required. - - 2. Altered source versions must be plainly marked as such, and must not be - misrepresented as being the original software. - - 3. This notice may not be removed or altered from any source - distribution. -******************************************************************************/ +/* + * Copyright (c) 2013 Hugh Bailey + * + * Permission to use, copy, modify, and distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + */ #include #include diff --git a/libobs/util/cf-lexer.h b/libobs/util/cf-lexer.h index 65953ac74..fc2cc5553 100644 --- a/libobs/util/cf-lexer.h +++ b/libobs/util/cf-lexer.h @@ -1,25 +1,18 @@ -/****************************************************************************** - Copyright (c) 2013 by Hugh Bailey - - This software is provided 'as-is', without any express or implied - warranty. In no event will the authors be held liable for any damages - arising from the use of this software. - - Permission is granted to anyone to use this software for any purpose, - including commercial applications, and to alter it and redistribute it - freely, subject to the following restrictions: - - 1. The origin of this software must not be misrepresented; you must not - claim that you wrote the original software. If you use this software - in a product, an acknowledgment in the product documentation would be - appreciated but is not required. - - 2. Altered source versions must be plainly marked as such, and must not be - misrepresented as being the original software. - - 3. This notice may not be removed or altered from any source - distribution. -******************************************************************************/ +/* + * Copyright (c) 2013 Hugh Bailey + * + * Permission to use, copy, modify, and distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + */ #pragma once diff --git a/libobs/util/cf-parser.c b/libobs/util/cf-parser.c index 4c1a98ac7..4e12e6eda 100644 --- a/libobs/util/cf-parser.c +++ b/libobs/util/cf-parser.c @@ -1,25 +1,18 @@ -/****************************************************************************** - Copyright (c) 2013 by Hugh Bailey - - This software is provided 'as-is', without any express or implied - warranty. In no event will the authors be held liable for any damages - arising from the use of this software. - - Permission is granted to anyone to use this software for any purpose, - including commercial applications, and to alter it and redistribute it - freely, subject to the following restrictions: - - 1. The origin of this software must not be misrepresented; you must not - claim that you wrote the original software. If you use this software - in a product, an acknowledgment in the product documentation would be - appreciated but is not required. - - 2. Altered source versions must be plainly marked as such, and must not be - misrepresented as being the original software. - - 3. This notice may not be removed or altered from any source - distribution. -******************************************************************************/ +/* + * Copyright (c) 2013 Hugh Bailey + * + * Permission to use, copy, modify, and distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + */ #include "cf-parser.h" diff --git a/libobs/util/cf-parser.h b/libobs/util/cf-parser.h index 23e357ef6..510210808 100644 --- a/libobs/util/cf-parser.h +++ b/libobs/util/cf-parser.h @@ -1,25 +1,18 @@ -/****************************************************************************** - Copyright (c) 2013 by Hugh Bailey - - This software is provided 'as-is', without any express or implied - warranty. In no event will the authors be held liable for any damages - arising from the use of this software. - - Permission is granted to anyone to use this software for any purpose, - including commercial applications, and to alter it and redistribute it - freely, subject to the following restrictions: - - 1. The origin of this software must not be misrepresented; you must not - claim that you wrote the original software. If you use this software - in a product, an acknowledgment in the product documentation would be - appreciated but is not required. - - 2. Altered source versions must be plainly marked as such, and must not be - misrepresented as being the original software. - - 3. This notice may not be removed or altered from any source - distribution. -******************************************************************************/ +/* + * Copyright (c) 2013 Hugh Bailey + * + * Permission to use, copy, modify, and distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + */ #pragma once diff --git a/libobs/util/circlebuf.h b/libobs/util/circlebuf.h index 5ed864102..9847fc578 100644 --- a/libobs/util/circlebuf.h +++ b/libobs/util/circlebuf.h @@ -1,25 +1,18 @@ -/****************************************************************************** - Copyright (c) 2013 by Hugh Bailey - - This software is provided 'as-is', without any express or implied - warranty. In no event will the authors be held liable for any damages - arising from the use of this software. - - Permission is granted to anyone to use this software for any purpose, - including commercial applications, and to alter it and redistribute it - freely, subject to the following restrictions: - - 1. The origin of this software must not be misrepresented; you must not - claim that you wrote the original software. If you use this software - in a product, an acknowledgment in the product documentation would be - appreciated but is not required. - - 2. Altered source versions must be plainly marked as such, and must not be - misrepresented as being the original software. - - 3. This notice may not be removed or altered from any source - distribution. -******************************************************************************/ +/* + * Copyright (c) 2013 Hugh Bailey + * + * Permission to use, copy, modify, and distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + */ #pragma once diff --git a/libobs/util/config-file.c b/libobs/util/config-file.c index 25e0bee0c..ad616fad9 100644 --- a/libobs/util/config-file.c +++ b/libobs/util/config-file.c @@ -1,25 +1,18 @@ -/****************************************************************************** - Copyright (c) 2013 by Hugh Bailey - - This software is provided 'as-is', without any express or implied - warranty. In no event will the authors be held liable for any damages - arising from the use of this software. - - Permission is granted to anyone to use this software for any purpose, - including commercial applications, and to alter it and redistribute it - freely, subject to the following restrictions: - - 1. The origin of this software must not be misrepresented; you must not - claim that you wrote the original software. If you use this software - in a product, an acknowledgment in the product documentation would be - appreciated but is not required. - - 2. Altered source versions must be plainly marked as such, and must not be - misrepresented as being the original software. - - 3. This notice may not be removed or altered from any source - distribution. -******************************************************************************/ +/* + * Copyright (c) 2013 Hugh Bailey + * + * Permission to use, copy, modify, and distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + */ #include #include diff --git a/libobs/util/config-file.h b/libobs/util/config-file.h index a5325a4a5..abf9277e9 100644 --- a/libobs/util/config-file.h +++ b/libobs/util/config-file.h @@ -1,25 +1,18 @@ -/****************************************************************************** - Copyright (c) 2013 by Hugh Bailey - - This software is provided 'as-is', without any express or implied - warranty. In no event will the authors be held liable for any damages - arising from the use of this software. - - Permission is granted to anyone to use this software for any purpose, - including commercial applications, and to alter it and redistribute it - freely, subject to the following restrictions: - - 1. The origin of this software must not be misrepresented; you must not - claim that you wrote the original software. If you use this software - in a product, an acknowledgment in the product documentation would be - appreciated but is not required. - - 2. Altered source versions must be plainly marked as such, and must not be - misrepresented as being the original software. - - 3. This notice may not be removed or altered from any source - distribution. -******************************************************************************/ +/* + * Copyright (c) 2013 Hugh Bailey + * + * Permission to use, copy, modify, and distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + */ #pragma once diff --git a/libobs/util/darray.h b/libobs/util/darray.h index 53343812a..d4355aaed 100644 --- a/libobs/util/darray.h +++ b/libobs/util/darray.h @@ -1,25 +1,18 @@ -/****************************************************************************** - Copyright (c) 2013 by Hugh Bailey - - This software is provided 'as-is', without any express or implied - warranty. In no event will the authors be held liable for any damages - arising from the use of this software. - - Permission is granted to anyone to use this software for any purpose, - including commercial applications, and to alter it and redistribute it - freely, subject to the following restrictions: - - 1. The origin of this software must not be misrepresented; you must not - claim that you wrote the original software. If you use this software - in a product, an acknowledgment in the product documentation would be - appreciated but is not required. - - 2. Altered source versions must be plainly marked as such, and must not be - misrepresented as being the original software. - - 3. This notice may not be removed or altered from any source - distribution. -******************************************************************************/ +/* + * Copyright (c) 2013 Hugh Bailey + * + * Permission to use, copy, modify, and distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + */ #pragma once diff --git a/libobs/util/dstr.c b/libobs/util/dstr.c index ef227b683..8e2aee331 100644 --- a/libobs/util/dstr.c +++ b/libobs/util/dstr.c @@ -1,25 +1,18 @@ -/****************************************************************************** - Copyright (c) 2013 by Hugh Bailey - - This software is provided 'as-is', without any express or implied - warranty. In no event will the authors be held liable for any damages - arising from the use of this software. - - Permission is granted to anyone to use this software for any purpose, - including commercial applications, and to alter it and redistribute it - freely, subject to the following restrictions: - - 1. The origin of this software must not be misrepresented; you must not - claim that you wrote the original software. If you use this software - in a product, an acknowledgment in the product documentation would be - appreciated but is not required. - - 2. Altered source versions must be plainly marked as such, and must not be - misrepresented as being the original software. - - 3. This notice may not be removed or altered from any source - distribution. -******************************************************************************/ +/* + * Copyright (c) 2013 Hugh Bailey + * + * Permission to use, copy, modify, and distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + */ #include #include diff --git a/libobs/util/dstr.h b/libobs/util/dstr.h index 3adbc657f..d0bbbb304 100644 --- a/libobs/util/dstr.h +++ b/libobs/util/dstr.h @@ -1,25 +1,18 @@ -/****************************************************************************** - Copyright (c) 2013 by Hugh Bailey - - This software is provided 'as-is', without any express or implied - warranty. In no event will the authors be held liable for any damages - arising from the use of this software. - - Permission is granted to anyone to use this software for any purpose, - including commercial applications, and to alter it and redistribute it - freely, subject to the following restrictions: - - 1. The origin of this software must not be misrepresented; you must not - claim that you wrote the original software. If you use this software - in a product, an acknowledgment in the product documentation would be - appreciated but is not required. - - 2. Altered source versions must be plainly marked as such, and must not be - misrepresented as being the original software. - - 3. This notice may not be removed or altered from any source - distribution. -******************************************************************************/ +/* + * Copyright (c) 2013 Hugh Bailey + * + * Permission to use, copy, modify, and distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + */ #pragma once diff --git a/libobs/util/lexer.c b/libobs/util/lexer.c index f0a41c664..d92a5bc03 100644 --- a/libobs/util/lexer.c +++ b/libobs/util/lexer.c @@ -1,25 +1,18 @@ -/****************************************************************************** - Copyright (c) 2013 by Hugh Bailey - - This software is provided 'as-is', without any express or implied - warranty. In no event will the authors be held liable for any damages - arising from the use of this software. - - Permission is granted to anyone to use this software for any purpose, - including commercial applications, and to alter it and redistribute it - freely, subject to the following restrictions: - - 1. The origin of this software must not be misrepresented; you must not - claim that you wrote the original software. If you use this software - in a product, an acknowledgment in the product documentation would be - appreciated but is not required. - - 2. Altered source versions must be plainly marked as such, and must not be - misrepresented as being the original software. - - 3. This notice may not be removed or altered from any source - distribution. -******************************************************************************/ +/* + * Copyright (c) 2013 Hugh Bailey + * + * Permission to use, copy, modify, and distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + */ #include #include "lexer.h" diff --git a/libobs/util/lexer.h b/libobs/util/lexer.h index ce11e2dee..00d7e27c0 100644 --- a/libobs/util/lexer.h +++ b/libobs/util/lexer.h @@ -1,25 +1,18 @@ -/****************************************************************************** - Copyright (c) 2013 by Hugh Bailey - - This software is provided 'as-is', without any express or implied - warranty. In no event will the authors be held liable for any damages - arising from the use of this software. - - Permission is granted to anyone to use this software for any purpose, - including commercial applications, and to alter it and redistribute it - freely, subject to the following restrictions: - - 1. The origin of this software must not be misrepresented; you must not - claim that you wrote the original software. If you use this software - in a product, an acknowledgment in the product documentation would be - appreciated but is not required. - - 2. Altered source versions must be plainly marked as such, and must not be - misrepresented as being the original software. - - 3. This notice may not be removed or altered from any source - distribution. -******************************************************************************/ +/* + * Copyright (c) 2013 Hugh Bailey + * + * Permission to use, copy, modify, and distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + */ #pragma once diff --git a/libobs/util/platform-cocoa.m b/libobs/util/platform-cocoa.m index c77c5d1bd..de1390b6c 100644 --- a/libobs/util/platform-cocoa.m +++ b/libobs/util/platform-cocoa.m @@ -1,25 +1,18 @@ -/****************************************************************************** - Copyright (c) 2013 by Ruwen Hahn - - This software is provided 'as-is', without any express or implied - warranty. In no event will the authors be held liable for any damages - arising from the use of this software. - - Permission is granted to anyone to use this software for any purpose, - including commercial applications, and to alter it and redistribute it - freely, subject to the following restrictions: - - 1. The origin of this software must not be misrepresented; you must not - claim that you wrote the original software. If you use this software - in a product, an acknowledgment in the product documentation would be - appreciated but is not required. - - 2. Altered source versions must be plainly marked as such, and must not be - misrepresented as being the original software. - - 3. This notice may not be removed or altered from any source - distribution. -******************************************************************************/ +/* + * Copyright (c) 2013 Ruwen Hahn + * + * Permission to use, copy, modify, and distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + */ #include "base.h" #include "platform.h" diff --git a/libobs/util/platform-nix.c b/libobs/util/platform-nix.c index 88351ad75..3fbfefc66 100644 --- a/libobs/util/platform-nix.c +++ b/libobs/util/platform-nix.c @@ -1,25 +1,18 @@ -/****************************************************************************** - Copyright (c) 2013 by Hugh Bailey - - This software is provided 'as-is', without any express or implied - warranty. In no event will the authors be held liable for any damages - arising from the use of this software. - - Permission is granted to anyone to use this software for any purpose, - including commercial applications, and to alter it and redistribute it - freely, subject to the following restrictions: - - 1. The origin of this software must not be misrepresented; you must not - claim that you wrote the original software. If you use this software - in a product, an acknowledgment in the product documentation would be - appreciated but is not required. - - 2. Altered source versions must be plainly marked as such, and must not be - misrepresented as being the original software. - - 3. This notice may not be removed or altered from any source - distribution. -******************************************************************************/ +/* + * Copyright (c) 2013 Hugh Bailey + * + * Permission to use, copy, modify, and distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + */ #include #include diff --git a/libobs/util/platform-windows.c b/libobs/util/platform-windows.c index 4ab43b2fc..ff2f1b894 100644 --- a/libobs/util/platform-windows.c +++ b/libobs/util/platform-windows.c @@ -1,25 +1,18 @@ -/****************************************************************************** - Copyright (c) 2013 by Hugh Bailey - - This software is provided 'as-is', without any express or implied - warranty. In no event will the authors be held liable for any damages - arising from the use of this software. - - Permission is granted to anyone to use this software for any purpose, - including commercial applications, and to alter it and redistribute it - freely, subject to the following restrictions: - - 1. The origin of this software must not be misrepresented; you must not - claim that you wrote the original software. If you use this software - in a product, an acknowledgment in the product documentation would be - appreciated but is not required. - - 2. Altered source versions must be plainly marked as such, and must not be - misrepresented as being the original software. - - 3. This notice may not be removed or altered from any source - distribution. -******************************************************************************/ +/* + * Copyright (c) 2013 Hugh Bailey + * + * Permission to use, copy, modify, and distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + */ #include #include diff --git a/libobs/util/platform.c b/libobs/util/platform.c index 35c57a050..00db609d3 100644 --- a/libobs/util/platform.c +++ b/libobs/util/platform.c @@ -1,25 +1,18 @@ -/****************************************************************************** - Copyright (c) 2013 by Hugh Bailey - - This software is provided 'as-is', without any express or implied - warranty. In no event will the authors be held liable for any damages - arising from the use of this software. - - Permission is granted to anyone to use this software for any purpose, - including commercial applications, and to alter it and redistribute it - freely, subject to the following restrictions: - - 1. The origin of this software must not be misrepresented; you must not - claim that you wrote the original software. If you use this software - in a product, an acknowledgment in the product documentation would be - appreciated but is not required. - - 2. Altered source versions must be plainly marked as such, and must not be - misrepresented as being the original software. - - 3. This notice may not be removed or altered from any source - distribution. -******************************************************************************/ +/* + * Copyright (c) 2013 Hugh Bailey + * + * Permission to use, copy, modify, and distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + */ #include #include diff --git a/libobs/util/platform.h b/libobs/util/platform.h index 553de6ae8..dd989086a 100644 --- a/libobs/util/platform.h +++ b/libobs/util/platform.h @@ -1,25 +1,18 @@ -/****************************************************************************** - Copyright (c) 2013 by Hugh Bailey - - This software is provided 'as-is', without any express or implied - warranty. In no event will the authors be held liable for any damages - arising from the use of this software. - - Permission is granted to anyone to use this software for any purpose, - including commercial applications, and to alter it and redistribute it - freely, subject to the following restrictions: - - 1. The origin of this software must not be misrepresented; you must not - claim that you wrote the original software. If you use this software - in a product, an acknowledgment in the product documentation would be - appreciated but is not required. - - 2. Altered source versions must be plainly marked as such, and must not be - misrepresented as being the original software. - - 3. This notice may not be removed or altered from any source - distribution. -******************************************************************************/ +/* + * Copyright (c) 2013 Hugh Bailey + * + * Permission to use, copy, modify, and distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + */ #pragma once diff --git a/libobs/util/serializer.h b/libobs/util/serializer.h index 163319cdc..08f7c9707 100644 --- a/libobs/util/serializer.h +++ b/libobs/util/serializer.h @@ -1,25 +1,18 @@ -/****************************************************************************** - Copyright (c) 2013 by Hugh Bailey - - This software is provided 'as-is', without any express or implied - warranty. In no event will the authors be held liable for any damages - arising from the use of this software. - - Permission is granted to anyone to use this software for any purpose, - including commercial applications, and to alter it and redistribute it - freely, subject to the following restrictions: - - 1. The origin of this software must not be misrepresented; you must not - claim that you wrote the original software. If you use this software - in a product, an acknowledgment in the product documentation would be - appreciated but is not required. - - 2. Altered source versions must be plainly marked as such, and must not be - misrepresented as being the original software. - - 3. This notice may not be removed or altered from any source - distribution. -******************************************************************************/ +/* + * Copyright (c) 2013 Hugh Bailey + * + * Permission to use, copy, modify, and distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + */ #pragma once diff --git a/libobs/util/text-lookup.c b/libobs/util/text-lookup.c index 0f370dce5..1ed09fec1 100644 --- a/libobs/util/text-lookup.c +++ b/libobs/util/text-lookup.c @@ -1,25 +1,18 @@ -/****************************************************************************** - Copyright (c) 2013 by Hugh Bailey - - This software is provided 'as-is', without any express or implied - warranty. In no event will the authors be held liable for any damages - arising from the use of this software. - - Permission is granted to anyone to use this software for any purpose, - including commercial applications, and to alter it and redistribute it - freely, subject to the following restrictions: - - 1. The origin of this software must not be misrepresented; you must not - claim that you wrote the original software. If you use this software - in a product, an acknowledgment in the product documentation would be - appreciated but is not required. - - 2. Altered source versions must be plainly marked as such, and must not be - misrepresented as being the original software. - - 3. This notice may not be removed or altered from any source - distribution. -******************************************************************************/ +/* + * Copyright (c) 2013 Hugh Bailey + * + * Permission to use, copy, modify, and distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + */ #include "dstr.h" #include "text-lookup.h" diff --git a/libobs/util/text-lookup.h b/libobs/util/text-lookup.h index 4461dad9e..f9855176f 100644 --- a/libobs/util/text-lookup.h +++ b/libobs/util/text-lookup.h @@ -1,25 +1,18 @@ -/****************************************************************************** - Copyright (c) 2013 by Hugh Bailey - - This software is provided 'as-is', without any express or implied - warranty. In no event will the authors be held liable for any damages - arising from the use of this software. - - Permission is granted to anyone to use this software for any purpose, - including commercial applications, and to alter it and redistribute it - freely, subject to the following restrictions: - - 1. The origin of this software must not be misrepresented; you must not - claim that you wrote the original software. If you use this software - in a product, an acknowledgment in the product documentation would be - appreciated but is not required. - - 2. Altered source versions must be plainly marked as such, and must not be - misrepresented as being the original software. - - 3. This notice may not be removed or altered from any source - distribution. -******************************************************************************/ +/* + * Copyright (c) 2013 Hugh Bailey + * + * Permission to use, copy, modify, and distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + */ #pragma once diff --git a/libobs/util/threading.h b/libobs/util/threading.h index d5041a041..c37045c56 100644 --- a/libobs/util/threading.h +++ b/libobs/util/threading.h @@ -1,25 +1,18 @@ -/****************************************************************************** - Copyright (c) 2013 by Hugh Bailey - - This software is provided 'as-is', without any express or implied - warranty. In no event will the authors be held liable for any damages - arising from the use of this software. - - Permission is granted to anyone to use this software for any purpose, - including commercial applications, and to alter it and redistribute it - freely, subject to the following restrictions: - - 1. The origin of this software must not be misrepresented; you must not - claim that you wrote the original software. If you use this software - in a product, an acknowledgment in the product documentation would be - appreciated but is not required. - - 2. Altered source versions must be plainly marked as such, and must not be - misrepresented as being the original software. - - 3. This notice may not be removed or altered from any source - distribution. -******************************************************************************/ +/* + * Copyright (c) 2013 Hugh Bailey + * + * Permission to use, copy, modify, and distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + */ #pragma once diff --git a/libobs/util/util.hpp b/libobs/util/util.hpp index 406abbf63..200e20cf1 100644 --- a/libobs/util/util.hpp +++ b/libobs/util/util.hpp @@ -1,19 +1,18 @@ -/****************************************************************************** - Copyright (C) 2013 by Hugh Bailey - - This program 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. - - This program 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 this program. If not, see . -******************************************************************************/ +/* + * Copyright (c) 2013 Hugh Bailey + * + * Permission to use, copy, modify, and distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + */ /* Useful C++ classes/bindings for util data and pointers */ diff --git a/libobs/util/windows/ComPtr.hpp b/libobs/util/windows/ComPtr.hpp index 93451ac0c..4f00c7572 100644 --- a/libobs/util/windows/ComPtr.hpp +++ b/libobs/util/windows/ComPtr.hpp @@ -1,25 +1,18 @@ -/****************************************************************************** - Copyright (c) 2013 by Hugh Bailey - - This software is provided 'as-is', without any express or implied - warranty. In no event will the authors be held liable for any damages - arising from the use of this software. - - Permission is granted to anyone to use this software for any purpose, - including commercial applications, and to alter it and redistribute it - freely, subject to the following restrictions: - - 1. The origin of this software must not be misrepresented; you must not - claim that you wrote the original software. If you use this software - in a product, an acknowledgment in the product documentation would be - appreciated but is not required. - - 2. Altered source versions must be plainly marked as such, and must not be - misrepresented as being the original software. - - 3. This notice may not be removed or altered from any source - distribution. -******************************************************************************/ +/* + * Copyright (c) 2013 Hugh Bailey + * + * Permission to use, copy, modify, and distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + */ #pragma once diff --git a/libobs/util/windows/HRError.hpp b/libobs/util/windows/HRError.hpp index a0bb09317..c5b673f80 100644 --- a/libobs/util/windows/HRError.hpp +++ b/libobs/util/windows/HRError.hpp @@ -1,25 +1,18 @@ -/****************************************************************************** - Copyright (c) 2013 by Hugh Bailey - - This software is provided 'as-is', without any express or implied - warranty. In no event will the authors be held liable for any damages - arising from the use of this software. - - Permission is granted to anyone to use this software for any purpose, - including commercial applications, and to alter it and redistribute it - freely, subject to the following restrictions: - - 1. The origin of this software must not be misrepresented; you must not - claim that you wrote the original software. If you use this software - in a product, an acknowledgment in the product documentation would be - appreciated but is not required. - - 2. Altered source versions must be plainly marked as such, and must not be - misrepresented as being the original software. - - 3. This notice may not be removed or altered from any source - distribution. -******************************************************************************/ +/* + * Copyright (c) 2013 Hugh Bailey + * + * Permission to use, copy, modify, and distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + */ #pragma once diff --git a/vs/2013/libobs/libobs.vcxproj b/vs/2013/libobs/libobs.vcxproj index dc5c66159..002293e58 100644 --- a/vs/2013/libobs/libobs.vcxproj +++ b/vs/2013/libobs/libobs.vcxproj @@ -19,6 +19,7 @@ + @@ -65,6 +66,7 @@ + diff --git a/vs/2013/libobs/libobs.vcxproj.filters b/vs/2013/libobs/libobs.vcxproj.filters index 585807259..cfc51980b 100644 --- a/vs/2013/libobs/libobs.vcxproj.filters +++ b/vs/2013/libobs/libobs.vcxproj.filters @@ -49,6 +49,15 @@ {21a99cbb-e167-4baf-82ae-47d23dc12c7d} cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + {d4a8b3db-e572-4106-bba6-1d30a89665b7} + + + {7501c673-436f-45f2-89c1-34fb78eb4743} + + + {938200c3-d99b-45f9-99d7-854accba352b} + @@ -183,6 +192,9 @@ media-io\Header Files + + callback\Header Files + @@ -305,5 +317,8 @@ libobs\Source Files + + callback\Source Files + \ No newline at end of file