Packman Build Service PMBS

obs-studio.changes Changed

obs-studio.spec Changed

obs-studio-allow-OBS_VERSION-to-be-set.patch Deleted

@@ -1,45 +0,0 @@
-From 0245e3b43ed3c48871522cd7720b78673415ddb8 Mon Sep 17 00:00:00 2001
-From: Jimmy Berry <jimmy@boombatower.com>
-Date: Fri, 30 Jan 2015 14:04:54 -0600
-Subject: [PATCH] Allow OBS_VERSION to be set to assist in packaging.
-
----
- cmake/Modules/ObsCpack.cmake | 20 +++++++++++++-------
- 1 file changed, 13 insertions(+), 7 deletions(-)
-
-diff --git a/cmake/Modules/ObsCpack.cmake b/cmake/Modules/ObsCpack.cmake
-index cb5e85a..6de6019 100644
---- a/cmake/Modules/ObsCpack.cmake
-+++ b/cmake/Modules/ObsCpack.cmake
-@@ -14,15 +14,21 @@ set(CPACK_PACKAGE_VERSION_MINOR "0")
- set(CPACK_PACKAGE_VERSION_PATCH "1")
- set(CPACK_PACKAGE_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}")
- 
--if(EXISTS "${CMAKE_SOURCE_DIR}/.git")
--	execute_process(COMMAND git describe --always --tags --dirty=-modified
--		OUTPUT_VARIABLE OBS_VERSION
--		WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}"
--		OUTPUT_STRIP_TRAILING_WHITESPACE)
--else()
--	set(OBS_VERSION "${CPACK_PACKAGE_VERSION}")
-+if(NOT DEFINED OBS_VERSION)
-+	if(EXISTS "${CMAKE_SOURCE_DIR}/.git")
-+		execute_process(COMMAND git describe --always --tags --dirty=-modified
-+			OUTPUT_VARIABLE OBS_VERSION
-+			WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}"
-+			OUTPUT_STRIP_TRAILING_WHITESPACE)
-+	endif()
-+
-+	# Fallback to static version when git is either not available or fails.
-+	if("${OBS_VERSION}" STREQUAL "")
-+		set(OBS_VERSION "${CPACK_PACKAGE_VERSION}")
-+	endif()
- endif()
- 
-+MESSAGE(STATUS "OBS_VERSION: ${OBS_VERSION}")
- 
- if(INSTALLER_RUN)
- 	set(CPACK_PACKAGE_EXECUTABLES
--- 
-2.1.4
-

_service Changed

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/libobs-d3d11/mingw Deleted

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/libobs-d3d11/mingw/dxgi.h Deleted

@@ -1,2713 +0,0 @@
-/*** Autogenerated by WIDL 1.5.25 from direct-x/include/dxgi.idl - Do not edit ***/
-
-#ifndef __REQUIRED_RPCNDR_H_VERSION__
-#define __REQUIRED_RPCNDR_H_VERSION__ 475
-#endif
-
-#include <rpc.h>
-#include <rpcndr.h>
-
-#ifndef COM_NO_WINDOWS_H
-#include <windows.h>
-#include <ole2.h>
-#endif
-
-#ifndef __dxgi_h__
-#define __dxgi_h__
-
-/* Forward declarations */
-
-#ifndef __IDXGIObject_FWD_DEFINED__
-#define __IDXGIObject_FWD_DEFINED__
-typedef interface IDXGIObject IDXGIObject;
-#endif
-
-#ifndef __IDXGIDeviceSubObject_FWD_DEFINED__
-#define __IDXGIDeviceSubObject_FWD_DEFINED__
-typedef interface IDXGIDeviceSubObject IDXGIDeviceSubObject;
-#endif
-
-#ifndef __IDXGIResource_FWD_DEFINED__
-#define __IDXGIResource_FWD_DEFINED__
-typedef interface IDXGIResource IDXGIResource;
-#endif
-
-#ifndef __IDXGIKeyedMutex_FWD_DEFINED__
-#define __IDXGIKeyedMutex_FWD_DEFINED__
-typedef interface IDXGIKeyedMutex IDXGIKeyedMutex;
-#endif
-
-#ifndef __IDXGISurface_FWD_DEFINED__
-#define __IDXGISurface_FWD_DEFINED__
-typedef interface IDXGISurface IDXGISurface;
-#endif
-
-#ifndef __IDXGISurface1_FWD_DEFINED__
-#define __IDXGISurface1_FWD_DEFINED__
-typedef interface IDXGISurface1 IDXGISurface1;
-#endif
-
-#ifndef __IDXGIOutput_FWD_DEFINED__
-#define __IDXGIOutput_FWD_DEFINED__
-typedef interface IDXGIOutput IDXGIOutput;
-#endif
-
-#ifndef __IDXGIAdapter_FWD_DEFINED__
-#define __IDXGIAdapter_FWD_DEFINED__
-typedef interface IDXGIAdapter IDXGIAdapter;
-#endif
-
-#ifndef __IDXGISwapChain_FWD_DEFINED__
-#define __IDXGISwapChain_FWD_DEFINED__
-typedef interface IDXGISwapChain IDXGISwapChain;
-#endif
-
-#ifndef __IDXGIFactory_FWD_DEFINED__
-#define __IDXGIFactory_FWD_DEFINED__
-typedef interface IDXGIFactory IDXGIFactory;
-#endif
-
-#ifndef __IDXGIDevice_FWD_DEFINED__
-#define __IDXGIDevice_FWD_DEFINED__
-typedef interface IDXGIDevice IDXGIDevice;
-#endif
-
-#ifndef __IDXGIAdapter1_FWD_DEFINED__
-#define __IDXGIAdapter1_FWD_DEFINED__
-typedef interface IDXGIAdapter1 IDXGIAdapter1;
-#endif
-
-#ifndef __IDXGIFactory1_FWD_DEFINED__
-#define __IDXGIFactory1_FWD_DEFINED__
-typedef interface IDXGIFactory1 IDXGIFactory1;
-#endif
-
-/* Headers for imported files */
-
-#include <oaidl.h>
-#include <ocidl.h>
-#include <dxgitype.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define _FACDXGI (0x87a)
-
-#define MAKE_DXGI_STATUS(x)                         MAKE_HRESULT(0, _FACDXGI, x)
-#define DXGI_STATUS_OCCLUDED                        MAKE_DXGI_STATUS(1)
-#define DXGI_STATUS_CLIPPED                         MAKE_DXGI_STATUS(2)
-#define DXGI_STATUS_NO_REDIRECTION                  MAKE_DXGI_STATUS(4)
-#define DXGI_STATUS_NO_DESKTOP_ACCESS               MAKE_DXGI_STATUS(5)
-#define DXGI_STATUS_GRAPHICS_VIDPN_SOURCE_IN_USE    MAKE_DXGI_STATUS(6)
-#define DXGI_STATUS_MODE_CHANGED                    MAKE_DXGI_STATUS(7)
-#define DXGI_STATUS_MODE_CHANGE_IN_PROGRESS         MAKE_DXGI_STATUS(8)
-#define MAKE_DXGI_HRESULT(x)                        MAKE_HRESULT(1, _FACDXGI, x)
-#define DXGI_ERROR_INVALID_CALL                     MAKE_DXGI_HRESULT(1)
-#define DXGI_ERROR_NOT_FOUND                        MAKE_DXGI_HRESULT(2)
-#define DXGI_ERROR_MORE_DATA                        MAKE_DXGI_HRESULT(3)
-#define DXGI_ERROR_UNSUPPORTED                      MAKE_DXGI_HRESULT(4)
-#define DXGI_ERROR_DEVICE_REMOVED                   MAKE_DXGI_HRESULT(5)
-#define DXGI_ERROR_DEVICE_HUNG                      MAKE_DXGI_HRESULT(6)
-#define DXGI_ERROR_DEVICE_RESET                     MAKE_DXGI_HRESULT(7)
-#define DXGI_ERROR_WAS_STILL_DRAWING                MAKE_DXGI_HRESULT(10)
-#define DXGI_ERROR_FRAME_STATISTICS_DISJOINT        MAKE_DXGI_HRESULT(11)
-#define DXGI_ERROR_GRAPHICS_VIDPN_SOURCE_IN_USE     MAKE_DXGI_HRESULT(12)
-#define DXGI_ERROR_DRIVER_INTERNAL_ERROR            MAKE_DXGI_HRESULT(32)
-#define DXGI_ERROR_NONEXCLUSIVE                     MAKE_DXGI_HRESULT(33)
-#define DXGI_ERROR_NOT_CURRENTLY_AVAILABLE          MAKE_DXGI_HRESULT(34)
-#if 0
-typedef HANDLE HMONITOR;
-typedef struct _LUID {
-    DWORD LowPart;
-    LONG HighPart;
-} LUID;
-typedef struct _LUID *PLUID;
-#endif
-typedef UINT DXGI_USAGE;
-#define DXGI_USAGE_SHADER_INPUT (0x10)
-
-#define DXGI_USAGE_RENDER_TARGET_OUTPUT (0x20)
-
-#define DXGI_USAGE_BACK_BUFFER (0x40)
-
-#define DXGI_USAGE_SHARED (0x80)
-
-#define DXGI_USAGE_READ_ONLY (0x100)
-
-#define DXGI_ENUM_MODES_INTERLACED (1)
-
-#define DXGI_ENUM_MODES_SCALING (2)
-
-typedef enum DXGI_SWAP_EFFECT {
-    DXGI_SWAP_EFFECT_DISCARD = 0,
-    DXGI_SWAP_EFFECT_SEQUENTIAL = 1
-} DXGI_SWAP_EFFECT;
-typedef enum DXGI_RESIDENCY {
-    DXGI_RESIDENCY_FULLY_RESIDENT = 1,
-    DXGI_RESIDENCY_RESIDENT_IN_SHARED_MEMORY = 2,
-    DXGI_RESIDENCY_EVICTED_TO_DISK = 3
-} DXGI_RESIDENCY;
-typedef struct DXGI_SURFACE_DESC {
-    UINT Width;
-    UINT Height;
-    DXGI_FORMAT Format;
-    DXGI_SAMPLE_DESC SampleDesc;
-} DXGI_SURFACE_DESC;
-typedef struct DXGI_MAPPED_RECT {
-    INT Pitch;
-    BYTE *pBits;
-} DXGI_MAPPED_RECT;
-typedef struct DXGI_OUTPUT_DESC {
-    WCHAR DeviceName[32];
-    RECT DesktopCoordinates;
-    WINBOOL AttachedToDesktop;
-    DXGI_MODE_ROTATION Rotation;
-    HMONITOR Monitor;
-} DXGI_OUTPUT_DESC;
-typedef struct DXGI_FRAME_STATISTICS {
-    UINT PresentCount;
-    UINT PresentRefreshCount;
-    UINT SyncRefreshCount;
-    LARGE_INTEGER SyncQPCTime;
-    LARGE_INTEGER SyncGPUTime;
-} DXGI_FRAME_STATISTICS;
-typedef struct DXGI_ADAPTER_DESC {
-    WCHAR Description[128];
-    UINT VendorId;
-    UINT DeviceId;
-    UINT SubSysId;
-    UINT Revision;
-    SIZE_T DedicatedVideoMemory;
-    SIZE_T DedicatedSystemMemory;
-    SIZE_T SharedSystemMemory;
-    LUID AdapterLuid;
-} DXGI_ADAPTER_DESC;
-typedef enum DXGI_SWAP_CHAIN_FLAG {
-    DXGI_SWAP_CHAIN_FLAG_NONPREROTATED = 1,
-    DXGI_SWAP_CHAIN_FLAG_ALLOW_MODE_SWITCH = 2,
-    DXGI_SWAP_CHAIN_FLAG_GDI_COMPATIBLE = 4
-} DXGI_SWAP_CHAIN_FLAG;
-typedef struct DXGI_SWAP_CHAIN_DESC {
-    DXGI_MODE_DESC BufferDesc;
-    DXGI_SAMPLE_DESC SampleDesc;
-    DXGI_USAGE BufferUsage;
-    UINT BufferCount;
-    HWND OutputWindow;
-    WINBOOL Windowed;
-    DXGI_SWAP_EFFECT SwapEffect;
-    UINT Flags;

obs-studio-0.8.2+git20150211.6099c65.tar.xz/.mailmap Added

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/CMakeLists.txt -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/CMakeLists.txt Changed

@@ -26,7 +26,7 @@
 
 if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX OR CMAKE_COMPILER_IS_CLANG)
 	set(CMAKE_CXX_FLAGS "-Wall -Wextra -Wno-unused-function -Werror-implicit-function-declaration -Wno-missing-field-initializers ${CMAKE_CXX_FLAGS} -fno-strict-aliasing")
-	set(CMAKE_C_FLAGS "-Wall -Wextra -Wno-unused-function -Werror-implicit-function-declaration -Wno-missing-field-initializers ${CMAKE_C_FLAGS} -std=gnu99 -fno-strict-aliasing")
+	set(CMAKE_C_FLAGS "-Wall -Wextra -Wno-unused-function -Werror-implicit-function-declaration -Wno-missing-braces -Wno-missing-field-initializers ${CMAKE_C_FLAGS} -std=gnu99 -fno-strict-aliasing")
 
 	option(USE_LIBC++ "Use libc++ instead of libstdc++" ${APPLE})
 	if(USE_LIBC++)
@@ -57,6 +57,10 @@
 		set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} /SAFESEH:NO")
 	endif()
 else()
+	if(MINGW)
+		set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_WIN32_WINNT=0x0600 -DWINVER=0x0600")
+		set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_WIN32_WINNT=0x0600 -DWINVER=0x0600")
+	endif()
 	set(CMAKE_C_FLAGS_DEBUG "-DDEBUG=1 -D_DEBUG=1 ${CMAKE_C_FLAGS_DEBUG}")
 	set(CMAKE_CXX_FLAGS_DEBUG "-DDEBUG=1 -D_DEBUG=1 ${CMAKE_C_FLAGS_DEBUG}")
 endif()

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/INSTALL -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/INSTALL Changed

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/cmake/Modules/CopyMSVCBins.cmake -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/cmake/Modules/CopyMSVCBins.cmake Changed

obs-studio-0.8.2+git20150211.6099c65.tar.xz/cmake/Modules/FindJack.cmake Added

@@ -0,0 +1,82 @@
+# - Try to find jack-2.6
+# Once done this will define
+#
+#  JACK_FOUND - system has jack
+#  JACK_INCLUDE_DIRS - the jack include directory
+#  JACK_LIBRARIES - Link these to use jack
+#  JACK_DEFINITIONS - Compiler switches required for using jack
+#
+#  Copyright (c) 2008 Andreas Schneider <mail@cynapses.org>
+#  Modified for other libraries by Lasse Kärkkäinen <tronic>
+#
+#  Redistribution and use is allowed according to the terms of the New
+#  BSD license.
+#  For details see the accompanying COPYING-CMAKE-SCRIPTS file.
+#
+
+if (JACK_LIBRARIES AND JACK_INCLUDE_DIRS)
+  # in cache already
+  set(JACK_FOUND TRUE)
+else (JACK_LIBRARIES AND JACK_INCLUDE_DIRS)
+  # use pkg-config to get the directories and then use these values
+  # in the FIND_PATH() and FIND_LIBRARY() calls
+  if (${CMAKE_MAJOR_VERSION} EQUAL 2 AND ${CMAKE_MINOR_VERSION} EQUAL 4)
+    include(UsePkgConfig)
+    pkgconfig(jack _JACK_INCLUDEDIR _JACK_LIBDIR _JACK_LDFLAGS _JACK_CFLAGS)
+  else (${CMAKE_MAJOR_VERSION} EQUAL 2 AND ${CMAKE_MINOR_VERSION} EQUAL 4)
+    find_package(PkgConfig)
+    if (PKG_CONFIG_FOUND)
+      pkg_check_modules(_JACK jack)
+    endif (PKG_CONFIG_FOUND)
+  endif (${CMAKE_MAJOR_VERSION} EQUAL 2 AND ${CMAKE_MINOR_VERSION} EQUAL 4)
+  find_path(JACK_INCLUDE_DIR
+    NAMES
+      jack/jack.h
+    PATHS
+      ${_JACK_INCLUDEDIR}
+      /usr/include
+      /usr/local/include
+      /opt/local/include
+      /sw/include
+  )
+
+  find_library(JACK_LIBRARY
+    NAMES
+      jack
+    PATHS
+      ${_JACK_LIBDIR}
+      /usr/lib
+      /usr/local/lib
+      /opt/local/lib
+      /sw/lib
+  )
+
+  if (JACK_LIBRARY AND JACK_INCLUDE_DIR)
+    set(JACK_FOUND TRUE)
+
+    set(JACK_INCLUDE_DIRS
+      ${JACK_INCLUDE_DIR}
+    )
+
+    set(JACK_LIBRARIES
+      ${JACK_LIBRARIES}
+      ${JACK_LIBRARY}
+    )
+
+  endif (JACK_LIBRARY AND JACK_INCLUDE_DIR)
+
+  if (JACK_FOUND)
+    if (NOT JACK_FIND_QUIETLY)
+      message(STATUS "Found jack: ${JACK_LIBRARY}")
+    endif (NOT JACK_FIND_QUIETLY)
+  else (JACK_FOUND)
+    if (JACK_FIND_REQUIRED)
+      message(FATAL_ERROR "Could not find JACK")
+    endif (JACK_FIND_REQUIRED)
+  endif (JACK_FOUND)
+
+  # show the JACK_INCLUDE_DIRS and JACK_LIBRARIES variables only in the advanced view
+  mark_as_advanced(JACK_INCLUDE_DIRS JACK_LIBRARIES)
+
+endif (JACK_LIBRARIES AND JACK_INCLUDE_DIRS)
+

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/cmake/Modules/ObsCpack.cmake -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/cmake/Modules/ObsCpack.cmake Changed

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/deps/CMakeLists.txt -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/deps/CMakeLists.txt Changed

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/deps/glad/CMakeLists.txt -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/deps/glad/CMakeLists.txt Changed

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/deps/glad/src/glad_wgl.c -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/deps/glad/src/glad_wgl.c Changed

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/libobs-d3d11/d3d11-duplicator.cpp -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/libobs-d3d11/d3d11-duplicator.cpp Changed

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/libobs-d3d11/d3d11-indexbuffer.cpp -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/libobs-d3d11/d3d11-indexbuffer.cpp Changed

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/libobs-d3d11/d3d11-samplerstate.cpp -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/libobs-d3d11/d3d11-samplerstate.cpp Changed

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/libobs-d3d11/d3d11-shader.cpp -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/libobs-d3d11/d3d11-shader.cpp Changed

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/libobs-d3d11/d3d11-shaderprocessor.cpp -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/libobs-d3d11/d3d11-shaderprocessor.cpp Changed

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/libobs-d3d11/d3d11-subsystem.cpp -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/libobs-d3d11/d3d11-subsystem.cpp Changed

@@ -15,7 +15,7 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 ******************************************************************************/
 
-#include <inttypes.h>
+#include <cinttypes>
 #include <util/base.h>
 #include <util/platform.h>
 #include <graphics/matrix3.h>
@@ -142,7 +142,7 @@
 	int ver = 49;
 
 	while (ver > 30) {
-		sprintf_s(d3dcompiler, 40, "D3DCompiler_%02d.dll", ver);
+		sprintf(d3dcompiler, "D3DCompiler_%02d.dll", ver);
 
 		HMODULE module = LoadLibraryA(d3dcompiler);
 		if (module) {
@@ -189,8 +189,8 @@
 	wstring adapterName;
 	DXGI_SWAP_CHAIN_DESC swapDesc;
 	DXGI_ADAPTER_DESC desc;
-	D3D_FEATURE_LEVEL levelUsed;
-	HRESULT hr;
+	D3D_FEATURE_LEVEL levelUsed = D3D_FEATURE_LEVEL_9_3;
+	HRESULT hr = 0;
 
 	make_swap_desc(swapDesc, data);
 
@@ -219,7 +219,7 @@
 		                         "swap chain", hr);
 
 	blog(LOG_INFO, "D3D11 loaded sucessfully, feature level used: %u",
-			(uint32_t)levelUsed);
+			(unsigned int)levelUsed);
 
 	defaultSwap.device     = this;
 	defaultSwap.hwnd       = (HWND)data->window.hwnd;
@@ -421,20 +421,7 @@
 }
 
 gs_device::gs_device(const gs_init_data *data)
-	: curRenderTarget      (NULL),
-	  curZStencilBuffer    (NULL),
-	  curRenderSide        (0),
-	  curIndexBuffer       (NULL),
-	  curVertexBuffer      (NULL),
-	  curVertexShader      (NULL),
-	  curPixelShader       (NULL),
-	  curSwapChain         (&defaultSwap),
-	  zstencilStateChanged (true),
-	  rasterStateChanged   (true),
-	  blendStateChanged    (true),
-	  curDepthStencilState (NULL),
-	  curRasterState       (NULL),
-	  curBlendState        (NULL),
+	: curSwapChain         (&defaultSwap),
 	  curToplogy           (D3D11_PRIMITIVE_TOPOLOGY_UNDEFINED)
 {
 	ComPtr<IDXGIAdapter1> adapter;

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/libobs-d3d11/d3d11-subsystem.hpp -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/libobs-d3d11/d3d11-subsystem.hpp Changed

@@ -59,6 +59,7 @@
 static inline DXGI_FORMAT ConvertGSTextureFormat(gs_color_format format)
 {
 	switch (format) {
+	case GS_UNKNOWN:     return DXGI_FORMAT_UNKNOWN;
 	case GS_A8:          return DXGI_FORMAT_A8_UNORM;
 	case GS_R8:          return DXGI_FORMAT_R8_UNORM;
 	case GS_RGBA:        return DXGI_FORMAT_R8G8B8A8_UNORM;
@@ -83,7 +84,7 @@
 
 static inline gs_color_format ConvertDXGITextureFormat(DXGI_FORMAT format)
 {
-	switch (format) {
+	switch ((unsigned long)format) {
 	case DXGI_FORMAT_A8_UNORM:           return GS_A8;
 	case DXGI_FORMAT_R8_UNORM:           return GS_R8;
 	case DXGI_FORMAT_R8G8B8A8_UNORM:     return GS_RGBA;
@@ -109,6 +110,7 @@
 static inline DXGI_FORMAT ConvertGSZStencilFormat(gs_zstencil_format format)
 {
 	switch (format) {
+	case GS_ZS_NONE:     return DXGI_FORMAT_UNKNOWN;
 	case GS_Z16:         return DXGI_FORMAT_D16_UNORM;
 	case GS_Z24_S8:      return DXGI_FORMAT_D24_UNORM_S8_UINT;
 	case GS_Z32F:        return DXGI_FORMAT_D32_FLOAT;
@@ -208,7 +210,7 @@
 	ComPtr<ID3D11Buffer>         tangentBuffer;
 	vector<ComPtr<ID3D11Buffer>> uvBuffers;
 
-	gs_device_t       *device;
+	gs_device_t    *device;
 	bool           dynamic;
 	VBDataPtr      vbd;
 	size_t         numVerts;
@@ -264,8 +266,8 @@
 
 	inline gs_texture(gs_device *device, gs_texture_type type,
 			uint32_t levels, gs_color_format format)
-		: device (device),
-		  type   (type),
+		: type   (type),
+		  device (device),
 		  levels (levels),
 		  format (format)
 	{
@@ -279,14 +281,14 @@
 	ComPtr<ID3D11RenderTargetView>   renderTarget[6];
 	ComPtr<IDXGISurface1>            gdiSurface;
 
-	uint32_t        width, height;
-	DXGI_FORMAT     dxgiFormat;
-	bool            isRenderTarget;
-	bool            isGDICompatible;
-	bool            isDynamic;
-	bool            isShared;
-	bool            genMipmaps;
-	uint32_t        sharedHandle;
+	uint32_t        width = 0, height = 0;
+	DXGI_FORMAT     dxgiFormat = DXGI_FORMAT_UNKNOWN;
+	bool            isRenderTarget = false;
+	bool            isGDICompatible = false;
+	bool            isDynamic = false;
+	bool            isShared = false;
+	bool            genMipmaps = false;
+	uint32_t        sharedHandle = 0;
 
 	void InitSRD(vector<D3D11_SUBRESOURCE_DATA> &srd, const uint8_t **data);
 	void InitTexture(const uint8_t **data);
@@ -294,16 +296,7 @@
 	void InitRenderTargets();
 
 	inline gs_texture_2d()
-		: gs_texture      (NULL, GS_TEXTURE_2D, 0, GS_UNKNOWN),
-		  width           (0),
-		  height          (0),
-		  dxgiFormat      (DXGI_FORMAT_UNKNOWN),
-		  isRenderTarget  (false),
-		  isGDICompatible (false),
-		  isDynamic       (false),
-		  isShared        (false),
-		  genMipmaps      (false),
-		  sharedHandle    (NULL)
+		: gs_texture (NULL, GS_TEXTURE_2D, 0, GS_UNKNOWN)
 	{
 	}
 
@@ -359,18 +352,18 @@
 };
 
 struct gs_shader_param {
-	string            name;
-	gs_shader_param_type type;
+	string                         name;
+	gs_shader_param_type           type;
 
-	uint32_t          textureID;
+	uint32_t                       textureID;
 
-	int               arrayCount;
+	int                            arrayCount;
 
-	size_t            pos;
+	size_t                         pos;
 
-	vector<uint8_t>   curValue;
-	vector<uint8_t>   defaultValue;
-	bool              changed;
+	vector<uint8_t>                curValue;
+	vector<uint8_t>                defaultValue;
+	bool                           changed;
 
 	gs_shader_param(shader_var &var, uint32_t &texCounter);
 };
@@ -390,8 +383,8 @@
 	gs_device_t             *device;
 	gs_shader_type          type;
 	vector<gs_shader_param> params;
-	ComPtr<ID3D11Buffer> constants;
-	size_t               constantSize;
+	ComPtr<ID3D11Buffer>    constants;
+	size_t                  constantSize;
 
 	inline void UpdateParam(vector<uint8_t> &constData,
 			gs_shader_param &param, bool &upload);
@@ -619,32 +612,32 @@
 	ComPtr<ID3D11DeviceContext> context;
 	gs_swap_chain               defaultSwap;
 
-	gs_texture_2d               *curRenderTarget;
-	gs_zstencil_buffer          *curZStencilBuffer;
-	int                         curRenderSide;
+	gs_texture_2d               *curRenderTarget = nullptr;
+	gs_zstencil_buffer          *curZStencilBuffer = nullptr;
+	int                         curRenderSide = 0;
 	gs_texture                  *curTextures[GS_MAX_TEXTURES];
 	gs_sampler_state            *curSamplers[GS_MAX_TEXTURES];
-	gs_vertex_buffer            *curVertexBuffer;
-	gs_index_buffer             *curIndexBuffer;
-	gs_vertex_shader            *curVertexShader;
-	gs_pixel_shader             *curPixelShader;
+	gs_vertex_buffer            *curVertexBuffer = nullptr;
+	gs_index_buffer             *curIndexBuffer = nullptr;
+	gs_vertex_shader            *curVertexShader = nullptr;
+	gs_pixel_shader             *curPixelShader = nullptr;
 	gs_swap_chain               *curSwapChain;
 
-	bool                        zstencilStateChanged;
-	bool                        rasterStateChanged;
-	bool                        blendStateChanged;
+	bool                        zstencilStateChanged = true;
+	bool                        rasterStateChanged = true;
+	bool                        blendStateChanged = true;
 	ZStencilState               zstencilState;
 	RasterState                 rasterState;
 	BlendState                  blendState;
 	vector<SavedZStencilState>  zstencilStates;
 	vector<SavedRasterState>    rasterStates;
 	vector<SavedBlendState>     blendStates;
-	ID3D11DepthStencilState     *curDepthStencilState;
-	ID3D11RasterizerState       *curRasterState;
-	ID3D11BlendState            *curBlendState;
+	ID3D11DepthStencilState     *curDepthStencilState = nullptr;
+	ID3D11RasterizerState       *curRasterState = nullptr;
+	ID3D11BlendState            *curBlendState = nullptr;
 	D3D11_PRIMITIVE_TOPOLOGY    curToplogy;
 
-	pD3DCompile                 d3dCompile;
+	pD3DCompile                 d3dCompile = nullptr;
 
 	gs_rect                     viewport;

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/libobs-d3d11/d3d11-texture2d.cpp -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/libobs-d3d11/d3d11-texture2d.cpp Changed

@@ -149,10 +149,10 @@
 	  width           (width),
 	  height          (height),
 	  dxgiFormat      (ConvertGSTextureFormat(format)),
+	  isRenderTarget  ((flags & GS_RENDER_TARGET) != 0),
 	  isGDICompatible (gdiCompatible),
-	  isShared        (shared),
 	  isDynamic       ((flags & GS_DYNAMIC) != 0),
-	  isRenderTarget  ((flags & GS_RENDER_TARGET) != 0),
+	  isShared        (shared),
 	  genMipmaps      ((flags & GS_BUILD_MIPMAPS) != 0)
 {
 	InitTexture(data);
@@ -163,15 +163,11 @@
 }
 
 gs_texture_2d::gs_texture_2d(gs_device_t *device, uint32_t handle)
-	: isRenderTarget  (false),
-	  isGDICompatible (false),
-	  isDynamic       (false),
-	  isShared        (true),
-	  genMipmaps      (false),
+	: isShared        (true),
 	  sharedHandle    (handle)
 {
 	HRESULT hr;
-	hr = device->device->OpenSharedResource((HANDLE)handle,
+	hr = device->device->OpenSharedResource((HANDLE)(uintptr_t)handle,
 			__uuidof(ID3D11Texture2D), (void**)texture.Assign());
 	if (FAILED(hr))
 		throw HRError("Failed to open resource", hr);

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/libobs-d3d11/d3d11-vertexbuffer.cpp -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/libobs-d3d11/d3d11-vertexbuffer.cpp Changed

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/libobs-opengl/gl-windows.c -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/libobs-opengl/gl-windows.c Changed

@@ -132,7 +132,7 @@
 	bool success = wglMakeCurrent(hdc, hglrc);
 	if (!success)
 		blog(LOG_ERROR, "wglMakeCurrent failed, GetLastError "
-		                "returned %u", GetLastError());
+		                "returned %lu", GetLastError());
 
 	return success;
 }
@@ -141,7 +141,7 @@
 {
 	HGLRC hglrc = wglCreateContext(hdc);
 	if (!hglrc) {
-		blog(LOG_ERROR, "wglCreateContext failed, %u", GetLastError());
+		blog(LOG_ERROR, "wglCreateContext failed, %lu", GetLastError());
 		return NULL;
 	}
 
@@ -168,8 +168,8 @@
 	if (GLAD_WGL_ARB_create_context) {
 		HGLRC hglrc = wglCreateContextAttribsARB(hdc, 0, attribs);
 		if (!hglrc) {
-			blog(LOG_ERROR, "wglCreateContextAttribsARB failed, %u",
-					GetLastError());
+			blog(LOG_ERROR, "wglCreateContextAttribsARB failed, "
+					"%lu", GetLastError());
 			return NULL;
 		}
 
@@ -202,13 +202,13 @@
 	init_dummy_pixel_format(&pfd);
 	format_index = ChoosePixelFormat(dummy->hdc, &pfd);
 	if (!format_index) {
-		blog(LOG_ERROR, "Dummy ChoosePixelFormat failed, %u",
+		blog(LOG_ERROR, "Dummy ChoosePixelFormat failed, %lu",
 				GetLastError());
 		return false;
 	}
 
 	if (!SetPixelFormat(dummy->hdc, format_index, &pfd)) {
-		blog(LOG_ERROR, "Dummy SetPixelFormat failed, %u",
+		blog(LOG_ERROR, "Dummy SetPixelFormat failed, %lu",
 				GetLastError());
 		return false;
 	}
@@ -297,7 +297,7 @@
 	success = wglChoosePixelFormatARB(hdc, attribs.array, NULL, 1, &format,
 				&num_formats);
 	if (!success || !num_formats) {
-		blog(LOG_ERROR, "wglChoosePixelFormatARB failed, %u",
+		blog(LOG_ERROR, "wglChoosePixelFormatARB failed, %lu",
 				GetLastError());
 		format = 0;
 	}
@@ -316,7 +316,7 @@
 	*format = gl_choose_pixel_format(hdc, info);
 
 	if (!DescribePixelFormat(hdc, *format, sizeof(*pfd), pfd)) {
-		blog(LOG_ERROR, "DescribePixelFormat failed, %u",
+		blog(LOG_ERROR, "DescribePixelFormat failed, %lu",
 				GetLastError());
 		return false;
 	}
@@ -328,7 +328,7 @@
 		PIXELFORMATDESCRIPTOR *pfd)
 {
 	if (!SetPixelFormat(hdc, format, pfd)) {
-		blog(LOG_ERROR, "SetPixelFormat failed, %u", GetLastError());
+		blog(LOG_ERROR, "SetPixelFormat failed, %lu", GetLastError());
 		return false;
 	}
 
@@ -514,7 +514,7 @@
 {
 	if (!SwapBuffers(device->cur_swap->wi->hdc)) {
 		blog(LOG_ERROR, "SwapBuffers failed, GetLastError "
-				"returned %u", GetLastError());
+				"returned %lu", GetLastError());
 		blog(LOG_ERROR, "device_present (GL) failed");
 	}
 }

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/libobs/CMakeLists.txt -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/libobs/CMakeLists.txt Changed

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/libobs/media-io/audio-io.c -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/libobs/media-io/audio-io.c Changed

@@ -34,7 +34,7 @@
 	struct audio_convert_info conversion;
 	audio_resampler_t         *resampler;
 
-	void (*callback)(void *param, struct audio_data *data);
+	audio_output_callback_t callback;
 	void *param;
 };
 
@@ -55,6 +55,9 @@
 
 	uint64_t                   next_ts_min;
 
+	/* specifies which mixes this line applies to via bits */
+	uint32_t                   mixers;
+
 	/* states whether this line is still being used.  if not, then when the
 	 * buffer is depleted, it's destroyed */
 	bool                       alive;
@@ -75,6 +78,11 @@
 	bfree(line);
 }
 
+struct audio_mix {
+	DARRAY(struct audio_input) inputs;
+	DARRAY(uint8_t)            mix_buffers[MAX_AV_PLANES];
+};
+
 struct audio_output {
 	struct audio_output_info   info;
 	size_t                     block_size;
@@ -84,15 +92,14 @@
 	pthread_t                  thread;
 	os_event_t                 *stop_event;
 
-	DARRAY(uint8_t)            mix_buffers[MAX_AV_PLANES];
-
 	bool                       initialized;
 
 	pthread_mutex_t            line_mutex;
 	struct audio_line          *first_line;
 
 	pthread_mutex_t            input_mutex;
-	DARRAY(struct audio_input) inputs;
+
+	struct audio_mix           mixes[MAX_AUDIO_MIXES];
 };
 
 static inline void audio_output_removeline(struct audio_output *audio,
@@ -188,29 +195,33 @@
 #define MIX_BUFFER_SIZE 256
 
 /* TODO: optimize mixing */
-static void mix_float(uint8_t *mix_in, struct circlebuf *buf, size_t size)
+static void mix_float(struct audio_output *audio, struct audio_line *line,
+		size_t size, size_t time_offset, size_t plane)
 {
-	float *mix = (float*)mix_in;
+	float *mixes[MAX_AUDIO_MIXES];
 	float vals[MIX_BUFFER_SIZE];
-	register float mix_val;
+
+	for (size_t mix_idx = 0; mix_idx < MAX_AUDIO_MIXES; mix_idx++) {
+		uint8_t *bytes = audio->mixes[mix_idx].mix_buffers[plane].array;
+		mixes[mix_idx] = (float*)&bytes[time_offset];
+	}
 
 	while (size) {
 		size_t pop_count = min_size(size, sizeof(vals));
 		size -= pop_count;
 
-		circlebuf_pop_front(buf, vals, pop_count);
+		circlebuf_pop_front(&line->buffers[plane], vals, pop_count);
 		pop_count /= sizeof(float);
 
-		/* This sequence provides hints for MSVC to use packed SSE 
-		 * instructions addps, minps, maxps, etc. */
-		for (size_t i = 0; i < pop_count; i++) {
-			mix_val =  *mix + vals[i];
-
-			/* clamp confuses the optimisation */
-			mix_val = (mix_val >  1.0f) ?  1.0f : mix_val; 
-			mix_val = (mix_val < -1.0f) ? -1.0f : mix_val;
+		for (size_t mix_idx = 0; mix_idx < MAX_AUDIO_MIXES; mix_idx++) {
+			/* only include this audio line in this mix if it's set
+			 * via the line's 'mixes' variable */
+			if ((line->mixers & (1 << mix_idx)) == 0)
+				continue;
 
-			*(mix++) = mix_val;
+			for (size_t i = 0; i < pop_count; i++) {
+				*(mixes[mix_idx]++) += vals[i];
+			}
 		}
 	}
 }
@@ -232,8 +243,7 @@
 	for (size_t i = 0; i < audio->planes; i++) {
 		size_t pop_size = min_size(size, line->buffers[i].size);
 
-		mix_float(audio->mix_buffers[i].array + time_offset,
-				&line->buffers[i], pop_size);
+		mix_float(audio, line, pop_size, time_offset, i);
 	}
 
 	return true;
@@ -266,27 +276,55 @@
 }
 
 static inline void do_audio_output(struct audio_output *audio,
-		uint64_t timestamp, uint32_t frames)
+		size_t mix_idx, uint64_t timestamp, uint32_t frames)
 {
+	struct audio_mix *mix = &audio->mixes[mix_idx];
 	struct audio_data data;
+
 	for (size_t i = 0; i < MAX_AV_PLANES; i++)
-		data.data[i] = audio->mix_buffers[i].array;
+		data.data[i] = mix->mix_buffers[i].array;
+
 	data.frames = frames;
 	data.timestamp = timestamp;
 	data.volume = 1.0f;
 
 	pthread_mutex_lock(&audio->input_mutex);
 
-	for (size_t i = 0; i < audio->inputs.num; i++) {
-		struct audio_input *input = audio->inputs.array+i;
+	for (size_t i = 0; i < mix->inputs.num; i++) {
+		struct audio_input *input = mix->inputs.array+i;
 
 		if (resample_audio_output(input, &data))
-			input->callback(input->param, &data);
+			input->callback(input->param, mix_idx, &data);
 	}
 
 	pthread_mutex_unlock(&audio->input_mutex);
 }
 
+static inline void clamp_audio_output(struct audio_output *audio, size_t bytes)
+{
+	size_t float_size = bytes / sizeof(float);
+
+	for (size_t mix_idx = 0; mix_idx < MAX_AUDIO_MIXES; mix_idx++) {
+		struct audio_mix *mix = &audio->mixes[mix_idx];
+
+		/* do not process mixing if a specific mix is inactive */
+		if (!mix->inputs.num)
+			continue;
+
+		for (size_t plane = 0; plane < audio->planes; plane++) {
+			float *mix_data = (float*)mix->mix_buffers[plane].array;
+			float *mix_end = &mix_data[float_size];
+
+			while (mix_data < mix_end) {
+				float val = *mix_data;
+				val = (val >  1.0f) ?  1.0f : val;
+				val = (val < -1.0f) ? -1.0f : val;
+				*(mix_data++) = val;
+			}
+		}
+	}
+}
+
 static uint64_t mix_and_output(struct audio_output *audio, uint64_t audio_time,
 		uint64_t prev_time)
 {
@@ -305,9 +343,13 @@
 	audio_time = prev_time + conv_frames_to_time(audio, frames);
 
 	/* resize and clear mix buffers */
-	for (size_t i = 0; i < audio->planes; i++) {
-		da_resize(audio->mix_buffers[i], bytes);
-		memset(audio->mix_buffers[i].array, 0, bytes);
+	for (size_t mix_idx = 0; mix_idx < MAX_AUDIO_MIXES; mix_idx++) {
+		struct audio_mix *mix = &audio->mixes[mix_idx];
+
+		for (size_t i = 0; i < audio->planes; i++) {
+			da_resize(mix->mix_buffers[i], bytes);
+			memset(mix->mix_buffers[i].array, 0, bytes);
+		}
 	}
 
 	/* mix audio lines */
@@ -338,8 +380,12 @@
 		line = next;
 	}
 
+	/* clamps audio data to -1.0..1.0 */
+	clamp_audio_output(audio, bytes);
+
 	/* output */
-	do_audio_output(audio, prev_time, frames);
+	for (size_t i = 0; i < MAX_AUDIO_MIXES; i++)
+		do_audio_output(audio, i, prev_time, frames);
 
 	return audio_time;
 }
@@ -373,12 +419,14 @@

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/libobs/media-io/audio-io.h -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/libobs/media-io/audio-io.h Changed

@@ -24,6 +24,8 @@
 extern "C" {
 #endif
 
+#define MAX_AUDIO_MIXES 4
+
 /*
  * Base audio output component.  Use this to create an audio output track
  * for the media.
@@ -172,13 +174,14 @@
 EXPORT int audio_output_open(audio_t **audio, struct audio_output_info *info);
 EXPORT void audio_output_close(audio_t *audio);
 
-EXPORT bool audio_output_connect(audio_t *video,
+typedef void (*audio_output_callback_t)(void *param, size_t mix_idx,
+		struct audio_data *data);
+
+EXPORT bool audio_output_connect(audio_t *video, size_t mix_idx,
 		const struct audio_convert_info *conversion,
-		void (*callback)(void *param, struct audio_data *data),
-		void *param);
-EXPORT void audio_output_disconnect(audio_t *video,
-		void (*callback)(void *param, struct audio_data *data),
-		void *param);
+		audio_output_callback_t callback, void *param);
+EXPORT void audio_output_disconnect(audio_t *video, size_t mix_idx,
+		audio_output_callback_t callback, void *param);
 
 EXPORT bool audio_output_active(const audio_t *audio);
 
@@ -189,7 +192,10 @@
 EXPORT const struct audio_output_info *audio_output_get_info(
 		const audio_t *audio);
 
-EXPORT audio_line_t *audio_output_create_line(audio_t *audio, const char *name);
+EXPORT audio_line_t *audio_output_create_line(audio_t *audio, const char *name,
+		uint32_t mixers);
+EXPORT void audio_line_set_mixers(audio_line_t *line, uint32_t mixers);
+EXPORT uint32_t audio_line_get_mixers(audio_line_t *line);
 EXPORT void audio_line_destroy(audio_line_t *line);
 EXPORT void audio_line_output(audio_line_t *line, const struct audio_data *data);

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/libobs/obs-cocoa.c -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/libobs/obs-cocoa.c Changed

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/libobs/obs-config.h -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/libobs/obs-config.h Changed

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/libobs/obs-data.c -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/libobs/obs-data.c Changed

@@ -798,12 +798,63 @@
 	set_item_data(data, item, name, ptr, size, type, false, true);
 }
 
+static void copy_obj(struct obs_data *data, const char *name,
+		struct obs_data *obj,
+		void (*callback)(obs_data_t *, const char *, obs_data_t *))
+{
+	if (obj) {
+		obs_data_t *new_obj = obs_data_create();
+		obs_data_apply(new_obj, obj);
+		callback(data, name, new_obj);
+		obs_data_release(new_obj);
+	}
+}
+
+static void copy_array(struct obs_data *data, const char *name,
+		struct obs_data_array *array,
+		void (*callback)(obs_data_t*, const char*, obs_data_array_t*))
+{
+	if (array) {
+		obs_data_array_t *new_array = obs_data_array_create();
+		da_reserve(new_array->objects, array->objects.num);
+
+		for (size_t i = 0; i < array->objects.num; i++) {
+			obs_data_t *new_obj = obs_data_create();
+			obs_data_t *obj = array->objects.array[i];
+
+			obs_data_apply(new_obj, obj);
+			obs_data_array_push_back(new_array, new_obj);
+
+			obs_data_release(new_obj);
+		}
+
+		callback(data, name, new_array);
+		obs_data_array_release(new_array);
+	}
+}
+
 static inline void copy_item(struct obs_data *data, struct obs_data_item *item)
 {
 	const char *name = get_item_name(item);
 	void *ptr = get_item_data(item);
 
-	set_item(data, NULL, name, ptr, item->data_len, item->type);
+	if (item->type == OBS_DATA_OBJECT) {
+		obs_data_t **obj = item->data_size ? ptr : NULL;
+
+		if (obj)
+			copy_obj(data, name, *obj, obs_data_set_obj);
+
+	} else if (item->type == OBS_DATA_ARRAY) {
+		obs_data_array_t **array = item->data_size ? ptr : NULL;
+
+		if (array)
+			copy_array(data, name, *array, obs_data_set_array);
+
+	} else {
+		if (item->data_size)
+			set_item(data, NULL, name, ptr, item->data_size,
+					item->type);
+	}
 }
 
 void obs_data_apply(obs_data_t *target, obs_data_t *apply_data)
@@ -831,6 +882,49 @@
 	}
 }
 
+static inline void clear_item(struct obs_data_item *item)
+{
+	void *ptr = get_item_data(item);
+	size_t size;
+
+	if (item->data_len) {
+		if (item->type == OBS_DATA_OBJECT) {
+			obs_data_t **obj = item->data_size ? ptr : NULL;
+
+			if (obj && *obj)
+				obs_data_release(*obj);
+
+		} else if (item->type == OBS_DATA_ARRAY) {
+			obs_data_array_t **array = item->data_size ? ptr : NULL;
+
+			if (array && *array)
+				obs_data_array_release(*array);
+		}
+
+		size = item->default_len + item->autoselect_size;
+		if (size)
+			memmove(ptr, (uint8_t*)ptr + item->data_len, size);
+
+		item->data_size = 0;
+		item->data_len = 0;
+	}
+}
+
+void obs_data_clear(obs_data_t *target)
+{
+	struct obs_data_item *item;
+
+	if (!target)
+		return;
+
+	item = target->first_item;
+
+	while (item) {
+		clear_item(item);
+		item = item->next;
+	}
+}
+
 typedef void (*set_item_t)(obs_data_t*, obs_data_item_t**, const char*,
 		const void*, size_t, enum obs_data_type);

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/libobs/obs-data.h -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/libobs/obs-data.h Changed

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/libobs/obs-encoder.c -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/libobs/obs-encoder.c Changed

@@ -57,7 +57,7 @@
 
 static struct obs_encoder *create_encoder(const char *id,
 		enum obs_encoder_type type, const char *name,
-		obs_data_t *settings)
+		obs_data_t *settings, size_t mixer_idx)
 {
 	struct obs_encoder *encoder;
 	struct obs_encoder_info *ei = find_encoder(id);
@@ -68,6 +68,7 @@
 
 	encoder = bzalloc(sizeof(struct obs_encoder));
 	encoder->info = *ei;
+	encoder->mixer_idx = mixer_idx;
 
 	success = init_encoder(encoder, name, settings);
 	if (!success) {
@@ -87,18 +88,18 @@
 		obs_data_t *settings)
 {
 	if (!name || !id) return NULL;
-	return create_encoder(id, OBS_ENCODER_VIDEO, name, settings);
+	return create_encoder(id, OBS_ENCODER_VIDEO, name, settings, 0);
 }
 
 obs_encoder_t *obs_audio_encoder_create(const char *id, const char *name,
-		obs_data_t *settings)
+		obs_data_t *settings, size_t mixer_idx)
 {
 	if (!name || !id) return NULL;
-	return create_encoder(id, OBS_ENCODER_AUDIO, name, settings);
+	return create_encoder(id, OBS_ENCODER_AUDIO, name, settings, mixer_idx);
 }
 
 static void receive_video(void *param, struct video_data *frame);
-static void receive_audio(void *param, struct audio_data *data);
+static void receive_audio(void *param, size_t mix_idx, struct audio_data *data);
 
 static inline struct audio_convert_info *get_audio_info(
 		const struct obs_encoder *encoder,
@@ -149,8 +150,8 @@
 
 	if (encoder->info.type == OBS_ENCODER_AUDIO) {
 		get_audio_info(encoder, &audio_info);
-		audio_output_connect(encoder->media, &audio_info, receive_audio,
-				encoder);
+		audio_output_connect(encoder->media, encoder->mixer_idx,
+				&audio_info, receive_audio, encoder);
 	} else {
 		struct video_scale_info *info =
 			get_video_info(encoder, &video_info);
@@ -180,8 +181,8 @@
 static void remove_connection(struct obs_encoder *encoder)
 {
 	if (encoder->info.type == OBS_ENCODER_AUDIO)
-		audio_output_disconnect(encoder->media, receive_audio,
-				encoder);
+		audio_output_disconnect(encoder->media, encoder->mixer_idx,
+				receive_audio, encoder);
 	else
 		video_output_disconnect(encoder->media, receive_video,
 				encoder);
@@ -248,6 +249,14 @@
 	return encoder ? encoder->context.name : NULL;
 }
 
+void obs_encoder_set_name(obs_encoder_t *encoder, const char *name)
+{
+	if (!encoder) return;
+
+	if (name && *name && strcmp(name, encoder->context.name) != 0)
+		obs_context_data_setname(&encoder->context, name);
+}
+
 static inline obs_data_t *get_defaults(const struct obs_encoder_info *info)
 {
 	obs_data_t *settings = obs_data_create();
@@ -437,6 +446,23 @@
 	return encoder ? encoder->info.codec : NULL;
 }
 
+const char *obs_get_encoder_codec(const char *id)
+{
+	struct obs_encoder_info *info = find_encoder(id);
+	return info ? info->codec : NULL;
+}
+
+enum obs_encoder_type obs_encoder_get_type(const obs_encoder_t *encoder)
+{
+	return encoder ? encoder->info.type : OBS_ENCODER_AUDIO;
+}
+
+enum obs_encoder_type obs_get_encoder_type(const char *id)
+{
+	struct obs_encoder_info *info = find_encoder(id);
+	return info ? info->type : OBS_ENCODER_AUDIO;
+}
+
 void obs_encoder_set_scaled_size(obs_encoder_t *encoder, uint32_t width,
 		uint32_t height)
 {
@@ -588,6 +614,7 @@
 
 	pkt.timebase_num = encoder->timebase_num;
 	pkt.timebase_den = encoder->timebase_den;
+	pkt.encoder = encoder;
 
 	success = encoder->info.encode(encoder->context.data, frame, &pkt,
 			&received);
@@ -644,7 +671,7 @@
 	size_t size = data->frames * encoder->blocksize;
 	size_t offset_size = 0;
 
-	if (encoder->paired_encoder && !encoder->start_ts) {
+	if (!encoder->start_ts && encoder->paired_encoder) {
 		uint64_t end_ts     = data->timestamp;
 		uint64_t v_start_ts = encoder->paired_encoder->start_ts;
 
@@ -666,6 +693,9 @@
 		}
 
 		encoder->start_ts = v_start_ts;
+
+	} else if (!encoder->start_ts && !encoder->paired_encoder) {
+		encoder->start_ts = data->timestamp;
 	}
 
 	size -= offset_size;
@@ -702,7 +732,7 @@
 	encoder->cur_pts += encoder->framesize;
 }
 
-static void receive_audio(void *param, struct audio_data *data)
+static void receive_audio(void *param, size_t mix_idx, struct audio_data *data)
 {
 	struct obs_encoder *encoder = param;
 
@@ -711,6 +741,8 @@
 
 	while (encoder->audio_input_buffer[0].size >= encoder->framesize_bytes)
 		send_audio_data(encoder);
+
+	UNUSED_PARAMETER(mix_idx);
 }
 
 void obs_encoder_add_output(struct obs_encoder *encoder,

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/libobs/obs-encoder.h -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/libobs/obs-encoder.h Changed

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/libobs/obs-internal.h -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/libobs/obs-internal.h Changed

@@ -388,7 +388,7 @@
 	bool                            received_video;
 	bool                            received_audio;
 	int64_t                         video_offset;
-	int64_t                         audio_offset;
+	int64_t                         audio_offsets[MAX_AUDIO_MIXES];
 	int64_t                         highest_audio_ts;
 	int64_t                         highest_video_ts;
 	pthread_mutex_t                 interleaved_mutex;
@@ -412,8 +412,9 @@
 	video_t                         *video;
 	audio_t                         *audio;
 	obs_encoder_t                   *video_encoder;
-	obs_encoder_t                   *audio_encoder;
+	obs_encoder_t                   *audio_encoders[MAX_AUDIO_MIXES];
 	obs_service_t                   *service;
+	size_t                          mixer_idx;
 
 	uint32_t                        scaled_width;
 	uint32_t                        scaled_height;
@@ -451,6 +452,8 @@
 	size_t                          framesize;
 	size_t                          framesize_bytes;
 
+	size_t                          mixer_idx;
+
 	uint32_t                        scaled_width;
 	uint32_t                        scaled_height;

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/libobs/obs-module.c -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/libobs/obs-module.c Changed

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/libobs/obs-output.c -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/libobs/obs-output.c Changed

@@ -135,9 +135,13 @@
 			obs_encoder_remove_output(output->video_encoder,
 					output);
 		}
-		if (output->audio_encoder) {
-			obs_encoder_remove_output(output->audio_encoder,
-					output);
+
+		for (size_t i = 0; i < MAX_AUDIO_MIXES; i++) {
+			if (output->audio_encoders[i]) {
+				obs_encoder_remove_output(
+						output->audio_encoders[i],
+						output);
+			}
 		}
 
 		pthread_mutex_destroy(&output->interleaved_mutex);
@@ -330,15 +334,33 @@
 	return output ? output->audio : NULL;
 }
 
+void obs_output_set_mixer(obs_output_t *output, size_t mixer_idx)
+{
+	if (!output)
+		return;
+
+	if (!output->active)
+		output->mixer_idx = mixer_idx;
+}
+
+size_t obs_output_get_mixer(const obs_output_t *output)
+{
+	return output ? output->mixer_idx : 0;
+}
+
 void obs_output_remove_encoder(struct obs_output *output,
 		struct obs_encoder *encoder)
 {
 	if (!output) return;
 
-	if (output->video_encoder == encoder)
+	if (output->video_encoder == encoder) {
 		output->video_encoder = NULL;
-	else if (output->audio_encoder == encoder)
-		output->audio_encoder = NULL;
+	} else {
+		for (size_t i = 0; i < MAX_AUDIO_MIXES; i++) {
+			if (output->audio_encoders[i] == encoder)
+				output->audio_encoders[i] = NULL;
+		}
+	}
 }
 
 void obs_output_set_video_encoder(obs_output_t *output, obs_encoder_t *encoder)
@@ -357,15 +379,27 @@
 				output->scaled_width, output->scaled_height);
 }
 
-void obs_output_set_audio_encoder(obs_output_t *output, obs_encoder_t *encoder)
+void obs_output_set_audio_encoder(obs_output_t *output, obs_encoder_t *encoder,
+		size_t idx)
 {
 	if (!output) return;
-	if (output->audio_encoder == encoder) return;
 	if (encoder && encoder->info.type != OBS_ENCODER_AUDIO) return;
 
-	obs_encoder_remove_output(output->audio_encoder, output);
+	if ((output->info.flags & OBS_OUTPUT_MULTI_TRACK) != 0) {
+		if (idx >= MAX_AUDIO_MIXES) {
+			return;
+		}
+	} else {
+		if (idx > 0) {
+			return;
+		}
+	}
+
+	if (output->audio_encoders[idx] == encoder) return;
+
+	obs_encoder_remove_output(output->audio_encoders[idx], output);
 	obs_encoder_add_output(encoder, output);
-	output->audio_encoder = encoder;
+	output->audio_encoders[idx] = encoder;
 }
 
 obs_encoder_t *obs_output_get_video_encoder(const obs_output_t *output)
@@ -373,9 +407,22 @@
 	return output ? output->video_encoder : NULL;
 }
 
-obs_encoder_t *obs_output_get_audio_encoder(const obs_output_t *output)
+obs_encoder_t *obs_output_get_audio_encoder(const obs_output_t *output,
+		size_t idx)
 {
-	return output ? output->audio_encoder : NULL;
+	if (!output) return NULL;
+
+	if ((output->info.flags & OBS_OUTPUT_MULTI_TRACK) != 0) {
+		if (idx >= MAX_AUDIO_MIXES) {
+			return NULL;
+		}
+	} else {
+		if (idx > 0) {
+			return NULL;
+		}
+	}
+
+	return output->audio_encoders[idx];
 }
 
 void obs_output_set_service(obs_output_t *output, obs_service_t *service)
@@ -491,6 +538,61 @@
 	output->audio_conversion_set = true;
 }
 
+static inline bool service_supports_multitrack(const struct obs_output *output)
+{
+	const struct obs_service *service = output->service;
+
+	if (!service || !service->info.supports_multitrack) {
+		return false;
+	}
+
+	return service->info.supports_multitrack(service->context.data);
+}
+
+static inline size_t num_audio_mixes(const struct obs_output *output)
+{
+	size_t mix_count = 1;
+
+	if ((output->info.flags & OBS_OUTPUT_SERVICE) != 0) {
+		if (!service_supports_multitrack(output)) {
+			return 1;
+		}
+	}
+
+	if ((output->info.flags & OBS_OUTPUT_MULTI_TRACK) != 0) {
+		mix_count = 0;
+
+		for (size_t i = 0; i < MAX_AUDIO_MIXES; i++) {
+			if (!output->audio_encoders[i])
+				break;
+
+			mix_count++;
+		}
+	}
+
+	return mix_count;
+}
+
+static inline bool audio_valid(const struct obs_output *output, bool encoded)
+{
+	if (encoded) {
+		size_t mix_count = num_audio_mixes(output);
+		if (!mix_count)
+			return false;
+
+		for (size_t i = 0; i < mix_count; i++) {
+			if (!output->audio_encoders[i]) {
+				return false;
+			}
+		}
+	} else {
+		if (!output->audio)
+			return false;
+	}
+
+	return true;
+}
+
 static bool can_begin_data_capture(const struct obs_output *output,
 		bool encoded, bool has_video, bool has_audio, bool has_service)
 {
@@ -505,12 +607,8 @@
 	}
 
 	if (has_audio) {
-		if (encoded) {
-			if (!output->audio_encoder)
-				return false;
-		} else {
-			if (!output->audio)
-				return false;
+		if (!audio_valid(output, encoded)) {
+			return false;
 		}
 	}
 
@@ -565,26 +663,43 @@
 	return output->audio_conversion_set ? &output->audio_conversion : NULL;
 }
 
-static void apply_interleaved_packet_offset(struct obs_output *output,
-		struct encoder_packet *out)
+static size_t get_track_index(const struct obs_output *output,
+		struct encoder_packet *pkt)
 {
-	int64_t offset;
+	for (size_t i = 0; i < MAX_AUDIO_MIXES; i++) {
+		struct obs_encoder *encoder = output->audio_encoders[i];

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/libobs/obs-output.h -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/libobs/obs-output.h Changed

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/libobs/obs-properties.h -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/libobs/obs-properties.h Changed

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/libobs/obs-service.c -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/libobs/obs-service.c Changed

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/libobs/obs-service.h -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/libobs/obs-service.h Changed

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/libobs/obs-source.c -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/libobs/obs-source.c Changed

@@ -84,6 +84,7 @@
 	"void update_flags(ptr source, int flags)",
 	"void audio_sync(ptr source, int out int offset)",
 	"void audio_data(ptr source, ptr data)",
+	"void audio_mixers(ptr source, in out int mixers)",
 	NULL
 };
 
@@ -126,7 +127,7 @@
 
 	if (info && info->output_flags & OBS_SOURCE_AUDIO) {
 		source->audio_line = audio_output_create_line(obs->audio.audio,
-				source->context.name);
+				source->context.name, 0xF);
 		if (!source->audio_line) {
 			blog(LOG_ERROR, "Failed to create audio line for "
 			                "source '%s'", source->context.name);
@@ -2167,6 +2168,37 @@
 	return source ? source->flags : 0;
 }
 
+void obs_source_set_audio_mixers(obs_source_t *source, uint32_t mixers)
+{
+	struct calldata data = {0};
+	uint32_t cur_mixers;
+
+	if (!source) return;
+	if ((source->info.output_flags & OBS_SOURCE_AUDIO) == 0) return;
+
+	cur_mixers = audio_line_get_mixers(source->audio_line);
+	if (cur_mixers == mixers)
+		return;
+
+	calldata_set_ptr(&data, "source", source);
+	calldata_set_int(&data, "mixers", mixers);
+
+	signal_handler_signal(source->context.signals, "audio_mixers", &data);
+
+	mixers = (uint32_t)calldata_int(&data, "mixers");
+	calldata_free(&data);
+
+	audio_line_set_mixers(source->audio_line, mixers);
+}
+
+uint32_t obs_source_get_audio_mixers(const obs_source_t *source)
+{
+	if (!source) return 0;
+	if ((source->info.output_flags & OBS_SOURCE_AUDIO) == 0) return 0;
+
+	return audio_line_get_mixers(source->audio_line);
+}
+
 void obs_source_draw_set_color_matrix(const struct matrix4 *color_matrix,
 		const struct vec3 *color_range_min,
 		const struct vec3 *color_range_max)

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/libobs/obs-win-crash-handler.c -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/libobs/obs-win-crash-handler.c Changed

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/libobs/obs-windows.c -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/libobs/obs-windows.c Changed

@@ -48,8 +48,23 @@
 
 void add_default_module_paths(void)
 {
+	char bin[512];
+	char data[512];
+	int ret;
+
 	for (int i = 0; i < module_patterns_size; i++)
 		obs_add_module_path(module_bin[i], module_data[i]);
+
+	ret = os_get_config_path(bin, sizeof(bin), "obs-plugins/%module%");
+	if (ret <= 0)
+		return;
+
+	strcpy(data, bin);
+	strcat(data, "/data");
+
+	strcat(bin, "/bin/" BIT_STRING);
+
+	obs_add_module_path(bin, data);
 }
 
 /* on windows, points to [base directory]/data/libobs */
@@ -97,7 +112,7 @@
 	status = RegQueryValueExW(key, L"~MHz", NULL, NULL, (LPBYTE)&speed,
 			&size);
 	if (status == ERROR_SUCCESS)
-		blog(LOG_INFO, "CPU Speed: %dMHz", speed);
+		blog(LOG_INFO, "CPU Speed: %ldMHz", speed);
 
 	RegCloseKey(key);
 }
@@ -163,9 +178,9 @@
 	const char *note = " (NOTE: 4 gigs max is normal for 32bit programs)";
 #endif
 
-	blog(LOG_INFO, "Physical Memory: %ldMB Total, %ldMB Free%s",
-			ms.dwTotalPhys / 1048576,
-			ms.dwAvailPhys / 1048576,
+	blog(LOG_INFO, "Physical Memory: %luMB Total, %luMB Free%s",
+			(DWORD)(ms.dwTotalPhys / 1048576),
+			(DWORD)(ms.dwAvailPhys / 1048576),
 			note);
 }
 
@@ -178,7 +193,7 @@
 	GetVersionExW(&osvi);
 
 	os_wcs_to_utf8_ptr(osvi.szCSDVersion, 0, &build);
-	blog(LOG_INFO, "Windows Version: %u.%u Build %u %s",
+	blog(LOG_INFO, "Windows Version: %ld.%ld Build %ld %s",
 			osvi.dwMajorVersion,
 			osvi.dwMinorVersion,
 			osvi.dwBuildNumber,

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/libobs/obs.c -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/libobs/obs.c Changed

@@ -1231,6 +1231,7 @@
 	double       volume;
 	int64_t      sync;
 	uint32_t     flags;
+	uint32_t     mixers;
 
 	source = obs_source_create(OBS_SOURCE_TYPE_INPUT, id, name, settings);
 
@@ -1241,6 +1242,10 @@
 	sync = obs_data_get_int(source_data, "sync");
 	obs_source_set_sync_offset(source, sync);
 
+	obs_data_set_default_int(source_data, "mixers", 0xF);
+	mixers = (uint32_t)obs_data_get_int(source_data, "mixers");
+	obs_source_set_audio_mixers(source, mixers);
+
 	obs_data_set_default_int(source_data, "flags", source->default_flags);
 	flags = (uint32_t)obs_data_get_int(source_data, "flags");
 	obs_source_set_flags(source, flags);
@@ -1283,6 +1288,7 @@
 	obs_data_t *source_data = obs_data_create();
 	obs_data_t *settings    = obs_source_get_settings(source);
 	float      volume      = obs_source_get_volume(source);
+	uint32_t   mixers      = obs_source_get_audio_mixers(source);
 	int64_t    sync        = obs_source_get_sync_offset(source);
 	uint32_t   flags       = obs_source_get_flags(source);
 	const char *name       = obs_source_get_name(source);
@@ -1293,6 +1299,7 @@
 	obs_data_set_string(source_data, "name",     name);
 	obs_data_set_string(source_data, "id",       id);
 	obs_data_set_obj   (source_data, "settings", settings);
+	obs_data_set_int   (source_data, "mixers",   mixers);
 	obs_data_set_int   (source_data, "sync",     sync);
 	obs_data_set_int   (source_data, "flags",    flags);
 	obs_data_set_double(source_data, "volume",   volume);

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/libobs/obs.h -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/libobs/obs.h Changed

@@ -761,13 +761,25 @@
 /** Specifies to force audio to mono */
 #define OBS_SOURCE_FLAG_FORCE_MONO             (1<<1)
 
-/** Sets source flags.  Note that these are different from the main output
- * flags. */
+/**
+ * Sets source flags.  Note that these are different from the main output
+ * flags.  These are generally things that can be set by the source or user,
+ * while the output flags are more used to determine capabilities of a source.
+ */
 EXPORT void obs_source_set_flags(obs_source_t *source, uint32_t flags);
 
 /** Gets source flags. */
 EXPORT uint32_t obs_source_get_flags(const obs_source_t *source);
 
+/**
+ * Sets audio mixer flags.  These flags are used to specify which mixers
+ * the source's audio should be applied to.
+ */
+EXPORT void obs_source_set_audio_mixers(obs_source_t *source, uint32_t mixers);
+
+/** Gets audio mixer flags */
+EXPORT uint32_t obs_source_get_audio_mixers(const obs_source_t *source);
+
 /* ------------------------------------------------------------------------- */
 /* Functions used by sources */
 
@@ -1030,6 +1042,12 @@
 /** Returns the audio media context associated with this output */
 EXPORT audio_t *obs_output_audio(const obs_output_t *output);
 
+/** Sets the current audio mixer for non-encoded outputs */
+EXPORT void obs_output_set_mixer(obs_output_t *output, size_t mixer_idx);
+
+/** Gets the current audio mixer for non-encoded outputs */
+EXPORT size_t obs_output_get_mixer(const obs_output_t *output);
+
 /**
  * Sets the current video encoder associated with this output,
  * required for encoded outputs
@@ -1039,16 +1057,27 @@
 
 /**
  * Sets the current audio encoder associated with this output,
- * required for encoded outputs
+ * required for encoded outputs.
+ *
+ * The idx parameter specifies the audio encoder index to set the encoder to.
+ * Only used with outputs that have multiple audio outputs (RTMP typically),
+ * otherwise the parameter is ignored.
  */
 EXPORT void obs_output_set_audio_encoder(obs_output_t *output,
-		obs_encoder_t *encoder);
+		obs_encoder_t *encoder, size_t idx);
 
 /** Returns the current video encoder associated with this output */
 EXPORT obs_encoder_t *obs_output_get_video_encoder(const obs_output_t *output);
 
-/** Returns the current audio encoder associated with this output */
-EXPORT obs_encoder_t *obs_output_get_audio_encoder(const obs_output_t *output);
+/**
+ * Returns the current audio encoder associated with this output
+ *
+ * The idx parameter specifies the audio encoder index.  Only used with
+ * outputs that have multiple audio outputs, otherwise the parameter is
+ * ignored.
+ */
+EXPORT obs_encoder_t *obs_output_get_audio_encoder(const obs_output_t *output,
+		size_t idx);
 
 /** Sets the current service associated with this output. */
 EXPORT void obs_output_set_service(obs_output_t *output,
@@ -1151,19 +1180,30 @@
  * @param  id        Audio Encoder ID
  * @param  name      Name to assign to this context
  * @param  settings  Settings
+ * @param  mixer_idx Index of the mixer to use for this audio encoder
  * @return           The video encoder context, or NULL if failed or not found.
  */
 EXPORT obs_encoder_t *obs_audio_encoder_create(const char *id, const char *name,
-		obs_data_t *settings);
+		obs_data_t *settings, size_t mixer_idx);
 
 /** Destroys an encoder context */
 EXPORT void obs_encoder_destroy(obs_encoder_t *encoder);
 
+EXPORT void obs_encoder_set_name(obs_encoder_t *encoder, const char *name);
 EXPORT const char *obs_encoder_get_name(const obs_encoder_t *encoder);
 
+/** Returns the codec of an encoder by the id */
+EXPORT const char *obs_get_encoder_codec(const char *id);
+
+/** Returns the type of an encoder by the id */
+EXPORT enum obs_encoder_type obs_get_encoder_type(const char *id);
+
 /** Returns the codec of the encoder */
 EXPORT const char *obs_encoder_get_codec(const obs_encoder_t *encoder);
 
+/** Returns the type of an encoder */
+EXPORT enum obs_encoder_type obs_encoder_get_type(const obs_encoder_t *encoder);
+
 /**
  * Sets the scaled resolution for a video encoder.  Set width and height to 0
  * to disable scaling.  If the encoder is active, this function will trigger
@@ -1255,7 +1295,7 @@
 EXPORT obs_properties_t *obs_service_properties(const obs_service_t *service);
 
 /** Gets the service type */
-EXPORT const char *obs_service_gettype(const obs_service_t *service);
+EXPORT const char *obs_service_get_type(const obs_service_t *service);
 
 /** Updates the settings of the service context */
 EXPORT void obs_service_update(obs_service_t *service, obs_data_t *settings);
@@ -1275,6 +1315,15 @@
 /** Returns the password (if any) for this service context */
 EXPORT const char *obs_service_get_password(const obs_service_t *service);
 
+/**
+ * Applies service-specific video encoder settings.
+ *
+ * @param  video_encoder  Video encoder to apply settings to.  Optional.
+ * @param  audio_encoder  Audio encoder to apply settings to.  Optional.
+ */
+EXPORT void obs_service_apply_encoder_settings(obs_service_t *service,
+		obs_encoder_t *video_encoder, obs_encoder_t *audio_encoder);
+
 
 /* ------------------------------------------------------------------------- */
 /* Source frame allocation functions */

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/libobs/util/platform-cocoa.m -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/libobs/util/platform-cocoa.m Changed

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/libobs/util/platform-nix.c -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/libobs/util/platform-nix.c Changed

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/libobs/util/platform-windows.c -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/libobs/util/platform-windows.c Changed

@@ -67,7 +67,7 @@
 	dstr_free(&dll_name);
 
 	if (!h_library)
-		blog(LOG_INFO, "LoadLibrary failed for '%s', error: %u",
+		blog(LOG_INFO, "LoadLibrary failed for '%s', error: %ld",
 				path, GetLastError());
 
 	return h_library;
@@ -191,7 +191,25 @@
 }
 
 /* returns %appdata%\[name] on windows */
-char *os_get_config_path(const char *name)
+int os_get_config_path(char *dst, size_t size, const char *name)
+{
+	wchar_t path_utf16[MAX_PATH];
+
+	SHGetFolderPathW(NULL, CSIDL_APPDATA, NULL, SHGFP_TYPE_CURRENT,
+			path_utf16);
+
+	if (os_wcs_to_utf8(path_utf16, 0, dst, size) != 0) {
+		if (strcat_s(dst, size, "\\") == 0) {
+			if (strcat_s(dst, size, name) == 0) {
+				return (int)strlen(dst);
+			}
+		}
+	}
+
+	return -1;
+}
+
+char *os_get_config_path_ptr(const char *name)
 {
 	char *ptr;
 	wchar_t path_utf16[MAX_PATH];
@@ -320,7 +338,6 @@
 	HANDLE                    handle;
 	WIN32_FIND_DATA           wfd;
 	int                       ret = -1;
-	os_glob_t                 *out = NULL;
 	wchar_t                   *w_path;
 
 	da_init(files);

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/libobs/util/platform.h -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/libobs/util/platform.h Changed

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/libobs/util/threading-posix.c -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/libobs/util/threading-posix.c Changed

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/libobs/util/threading-windows.c -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/libobs/util/threading-windows.c Changed

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/libobs/util/utf8.c -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/libobs/util/utf8.c Changed

@@ -17,6 +17,58 @@
 
 #include "utf8.h"
 
+#ifdef _WIN32
+
+#include <windows.h>
+#include "c99defs.h"
+
+static inline bool has_utf8_bom(const char *in_char)
+{
+	uint8_t *in = (uint8_t*)in_char;
+	return (in && in[0] == 0xef && in[1] == 0xbb && in[2] == 0xbf);
+}
+
+size_t utf8_to_wchar(const char *in, size_t insize, wchar_t *out,
+		size_t outsize, int flags)
+{
+	int i_insize = (int)insize;
+	int ret;
+
+	if (i_insize == 0)
+		i_insize = (int)strlen(in);
+
+	/* prevent bom from being used in the string */
+	if (has_utf8_bom(in)) {
+		if (i_insize >= 3) {
+			in += 3;
+			insize -= 3;
+		}
+	}
+
+	ret = MultiByteToWideChar(CP_UTF8, 0, in, i_insize, out, (int)outsize);
+
+	UNUSED_PARAMETER(flags);
+	return (ret > 0) ? (size_t)ret : 0;
+}
+
+size_t wchar_to_utf8(const wchar_t *in, size_t insize, char *out,
+		size_t outsize, int flags)
+{
+	int i_insize = (int)insize;
+	int ret;
+
+	if (i_insize == 0)
+		i_insize = (int)wcslen(in);
+
+	ret = WideCharToMultiByte(CP_UTF8, 0, in, i_insize, out, (int)outsize,
+			NULL, NULL);
+
+	UNUSED_PARAMETER(flags);
+	return (ret > 0) ? (size_t)ret : 0;
+}
+
+#else
+
 #define _NXT	0x80
 #define _SEQ2	0xc0
 #define _SEQ3	0xe0
@@ -318,3 +370,5 @@
 
 	return total;
 }
+
+#endif

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/libobs/util/windows/ComPtr.hpp -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/libobs/util/windows/ComPtr.hpp Changed

@@ -19,7 +19,9 @@
 /* Oh no I have my own com pointer class, the world is ending, how dare you
  * write your own! */
 
-template<typename T> class ComPtr {
+template<class T> class ComPtr {
+
+protected:
 	T *ptr;
 
 	inline void Kill()
@@ -38,11 +40,11 @@
 	}
 
 public:
-	inline ComPtr() : ptr(NULL)                  {}
-	inline ComPtr(T *p) : ptr(p)                 {if (ptr) ptr->AddRef();}
-	inline ComPtr(const ComPtr &c) : ptr(c.ptr)  {if (ptr) ptr->AddRef();}
-	inline ComPtr(ComPtr &&c) : ptr(c.ptr)       {c.ptr = NULL;}
-	inline ~ComPtr()                             {Kill();}
+	inline ComPtr() : ptr(NULL)                    {}
+	inline ComPtr(T *p) : ptr(p)                   {if (ptr) ptr->AddRef();}
+	inline ComPtr(const ComPtr<T> &c) : ptr(c.ptr) {if (ptr) ptr->AddRef();}
+	inline ComPtr(ComPtr<T> &&c) : ptr(c.ptr)      {c.ptr = NULL;}
+	inline ~ComPtr()                               {Kill();}
 
 	inline void Clear()
 	{
@@ -52,19 +54,19 @@
 		}
 	}
 
-	inline ComPtr &operator=(T *p)
+	inline ComPtr<T> &operator=(T *p)
 	{
 		Replace(p);
 		return *this;
 	}
 
-	inline ComPtr &operator=(const ComPtr &c)
+	inline ComPtr<T> &operator=(const ComPtr<T> &c)
 	{
 		Replace(c.ptr);
 		return *this;
 	}
 
-	inline ComPtr &operator=(ComPtr &&c)
+	inline ComPtr<T> &operator=(ComPtr<T> &&c)
 	{
 		if (this != &c) {
 			Kill();
@@ -75,13 +77,37 @@
 		return *this;
 	}
 
+	inline T *Detach()
+	{
+		T *out = ptr;
+		ptr = nullptr;
+		return out;
+	}
+
+	inline void CopyTo(T **out)
+	{
+		if (out) {
+			if (ptr) ptr->AddRef();
+			*out = ptr;
+		}
+	}
+
+	inline ULONG Release()
+	{
+		ULONG ref;
+
+		if (!ptr) return 0;
+		ref = ptr->Release();
+		ptr = nullptr;
+		return ref;
+	}
+
 	inline T **Assign()                {Clear(); return &ptr;}
 	inline void Set(T *p)              {Kill(); ptr = p;}
 
 	inline T *Get() const              {return ptr;}
 
-	/* nabbed this one from virtualdub */
-	inline T **operator~()             {return Assign();}
+	inline T **operator&()             {return Assign();}
 
 	inline    operator T*() const      {return ptr;}
 	inline T *operator->() const       {return ptr;}
@@ -91,3 +117,20 @@
 
 	inline bool operator!() const      {return !ptr;}
 };
+
+template<class T> class ComQIPtr : public ComPtr<T> {
+
+public:
+	inline ComQIPtr(IUnknown *unk)
+	{
+		this->ptr = nullptr;
+		unk->QueryInterface(__uuidof(T), (void**)&this->ptr);
+	}
+
+	inline ComPtr<T> &operator=(IUnknown *unk)
+	{
+		ComPtr<T>::Clear();
+		unk->QueryInterface(__uuidof(T), (void**)&this->ptr);
+		return *this;
+	}
+};

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/obs/CMakeLists.txt -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/obs/CMakeLists.txt Changed

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/obs/adv-audio-control.cpp -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/obs/adv-audio-control.cpp Changed

@@ -1,4 +1,5 @@
 #include <QHBoxLayout>
+#include <QGridLayout>
 #include <QLabel>
 #include <QSpinBox>
 #include <QCheckBox>
@@ -10,21 +11,18 @@
 #define NSEC_PER_MSEC 1000000
 #endif
 
-OBSAdvAudioCtrl::OBSAdvAudioCtrl(obs_source_t *source_)
+OBSAdvAudioCtrl::OBSAdvAudioCtrl(QGridLayout *layout, obs_source_t *source_)
 	: source(source_)
 {
-	QWidget *forceMonoContainer;
-	QWidget *mediaChannelContainer;
-	QWidget *panningContainer;
 	QHBoxLayout *hlayout;
-	QLabel  *labelL, *labelR;
 	signal_handler_t *handler = obs_source_get_signal_handler(source);
 	const char *sourceName = obs_source_get_name(source);
 	float vol = obs_source_get_volume(source);
 	uint32_t flags = obs_source_get_flags(source);
+	uint32_t mixers = obs_source_get_audio_mixers(source);
 
 	forceMonoContainer             = new QWidget();
-	mediaChannelContainer          = new QWidget();
+	mixerContainer                 = new QWidget();
 	panningContainer               = new QWidget();
 	labelL                         = new QLabel();
 	labelR                         = new QLabel();
@@ -33,10 +31,10 @@
 	forceMono                      = new QCheckBox();
 	panning                        = new QSlider(Qt::Horizontal);
 	syncOffset                     = new QSpinBox();
-	mediaChannel1                  = new QCheckBox();
-	mediaChannel2                  = new QCheckBox();
-	mediaChannel3                  = new QCheckBox();
-	mediaChannel4                  = new QCheckBox();
+	mixer1                         = new QCheckBox();
+	mixer2                         = new QCheckBox();
+	mixer3                         = new QCheckBox();
+	mixer4                         = new QCheckBox();
 
 	volChangedSignal.Connect(handler, "volume", OBSSourceVolumeChanged,
 			this);
@@ -44,16 +42,19 @@
 			this);
 	flagsSignal.Connect(handler, "update_flags", OBSSourceFlagsChanged,
 			this);
+	mixersSignal.Connect(handler, "audio_mixers", OBSSourceMixersChanged,
+			this);
 
 	hlayout = new QHBoxLayout();
 	hlayout->setContentsMargins(0, 0, 0, 0);
 	forceMonoContainer->setLayout(hlayout);
 	hlayout = new QHBoxLayout();
 	hlayout->setContentsMargins(0, 0, 0, 0);
-	mediaChannelContainer->setLayout(hlayout);
+	mixerContainer->setLayout(hlayout);
 	hlayout = new QHBoxLayout();
 	hlayout->setContentsMargins(0, 0, 0, 0);
 	panningContainer->setLayout(hlayout);
+	panningContainer->setMinimumWidth(100);
 
 	labelL->setText("L");
 
@@ -65,14 +66,10 @@
 
 	volume->setMinimum(0);
 	volume->setMaximum(2000);
-	volume->setMinimumWidth(130);
-	volume->setMaximumWidth(130);
 	volume->setValue(int(vol * 100.0f));
 
 	forceMono->setChecked((flags & OBS_SOURCE_FLAG_FORCE_MONO) != 0);
 
-	forceMonoContainer->setMinimumWidth(130);
-	forceMonoContainer->setMaximumWidth(130);
 	forceMonoContainer->layout()->addWidget(forceMono);
 	forceMonoContainer->layout()->setAlignment(forceMono,
 			Qt::AlignHCenter | Qt::AlignVCenter);
@@ -86,32 +83,26 @@
 	int64_t cur_sync = obs_source_get_sync_offset(source);
 	syncOffset->setMinimum(-20000);
 	syncOffset->setMaximum(20000);
-	syncOffset->setMinimumWidth(130);
-	syncOffset->setMaximumWidth(130);
 	syncOffset->setValue(int(cur_sync / NSEC_PER_MSEC));
 
-	mediaChannel1->setChecked(true);
-	mediaChannel1->setText("1");
-	mediaChannel1->setEnabled(false);
-	mediaChannel2->setText("2");
-	mediaChannel2->setEnabled(false);
-	mediaChannel3->setText("3");
-	mediaChannel3->setEnabled(false);
-	mediaChannel4->setText("4");
-	mediaChannel4->setEnabled(false);
-
-	panningContainer->setMinimumWidth(140);
-	panningContainer->setMaximumWidth(140);
+	mixer1->setText("1");
+	mixer1->setChecked(mixers & (1<<0));
+	mixer2->setText("2");
+	mixer2->setChecked(mixers & (1<<1));
+	mixer3->setText("3");
+	mixer3->setChecked(mixers & (1<<2));
+	mixer4->setText("4");
+	mixer4->setChecked(mixers & (1<<3));
+
 	panningContainer->layout()->addWidget(labelL);
 	panningContainer->layout()->addWidget(panning);
 	panningContainer->layout()->addWidget(labelR);
+	panningContainer->setMaximumWidth(170);
 
-	mediaChannelContainer->setMinimumWidth(160);
-	mediaChannelContainer->setMaximumWidth(160);
-	mediaChannelContainer->layout()->addWidget(mediaChannel1);
-	mediaChannelContainer->layout()->addWidget(mediaChannel2);
-	mediaChannelContainer->layout()->addWidget(mediaChannel3);
-	mediaChannelContainer->layout()->addWidget(mediaChannel4);
+	mixerContainer->layout()->addWidget(mixer1);
+	mixerContainer->layout()->addWidget(mixer2);
+	mixerContainer->layout()->addWidget(mixer3);
+	mixerContainer->layout()->addWidget(mixer4);
 
 	QWidget::connect(volume, SIGNAL(valueChanged(int)),
 			this, SLOT(volumeChanged(int)));
@@ -121,25 +112,35 @@
 			this, SLOT(panningChanged(int)));
 	QWidget::connect(syncOffset, SIGNAL(valueChanged(int)),
 			this, SLOT(syncOffsetChanged(int)));
-	QWidget::connect(mediaChannel1, SIGNAL(clicked(bool)),
-			this, SLOT(mediaChannel1Changed(bool)));
-	QWidget::connect(mediaChannel2, SIGNAL(clicked(bool)),
-			this, SLOT(mediaChannel2Changed(bool)));
-	QWidget::connect(mediaChannel3, SIGNAL(clicked(bool)),
-			this, SLOT(mediaChannel3Changed(bool)));
-	QWidget::connect(mediaChannel4, SIGNAL(clicked(bool)),
-			this, SLOT(mediaChannel4Changed(bool)));
-
-	hlayout = new QHBoxLayout;
-	hlayout->setContentsMargins(0, 0, 0, 0);
-	hlayout->addWidget(nameLabel);
-	hlayout->addWidget(volume);
-	hlayout->addWidget(forceMonoContainer);
-	hlayout->addWidget(panningContainer);
-	hlayout->addWidget(syncOffset);
-	hlayout->addWidget(mediaChannelContainer);
-	setLayout(hlayout);
-	setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Maximum);
+	QWidget::connect(mixer1, SIGNAL(clicked(bool)),
+			this, SLOT(mixer1Changed(bool)));
+	QWidget::connect(mixer2, SIGNAL(clicked(bool)),
+			this, SLOT(mixer2Changed(bool)));
+	QWidget::connect(mixer3, SIGNAL(clicked(bool)),
+			this, SLOT(mixer3Changed(bool)));
+	QWidget::connect(mixer4, SIGNAL(clicked(bool)),
+			this, SLOT(mixer4Changed(bool)));
+
+	int lastRow = layout->rowCount();
+
+	layout->addWidget(nameLabel, lastRow, 0);
+	layout->addWidget(volume, lastRow, 1);
+	layout->addWidget(forceMonoContainer, lastRow, 2);
+	layout->addWidget(panningContainer, lastRow, 3);
+	layout->addWidget(syncOffset, lastRow, 4);
+	layout->addWidget(mixerContainer, lastRow, 5);
+	layout->layout()->setAlignment(mixerContainer,
+			Qt::AlignHCenter | Qt::AlignVCenter);
+}
+
+OBSAdvAudioCtrl::~OBSAdvAudioCtrl()
+{
+	nameLabel->deleteLater();
+	volume->deleteLater();
+	forceMonoContainer->deleteLater();
+	panningContainer->deleteLater();
+	syncOffset->deleteLater();
+	mixerContainer->deleteLater();
 }
 
 /* ------------------------------------------------------------------------- */
@@ -167,15 +168,27 @@
 			"SourceSyncChanged", Q_ARG(int64_t, offset));
 }
 
+void OBSAdvAudioCtrl::OBSSourceMixersChanged(void *param, calldata_t *calldata)
+{
+	uint32_t mixers = (uint32_t)calldata_int(calldata, "mixers");
+	QMetaObject::invokeMethod(reinterpret_cast<OBSAdvAudioCtrl*>(param),
+			"SourceMixersChanged", Q_ARG(uint32_t, mixers));
+}
+
 /* ------------------------------------------------------------------------- */
 /* Qt event queue source callbacks */
 
+static inline void setCheckboxState(QCheckBox *checkbox, bool checked)
+{

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/obs/adv-audio-control.hpp -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/obs/adv-audio-control.hpp Changed

@@ -2,37 +2,49 @@
 
 #include <obs.hpp>
 #include <QWidget>
+#include <QPointer>
 
+class QGridLayout;
 class QLabel;
 class QSpinBox;
 class QCheckBox;
 class QSlider;
 
-class OBSAdvAudioCtrl : public QWidget {
+class OBSAdvAudioCtrl : public QObject {
 	Q_OBJECT
 
 private:
 	OBSSource              source;
-	QLabel                 *nameLabel              = nullptr;
-	QSpinBox               *volume                 = nullptr;
-	QCheckBox              *forceMono              = nullptr;
-	QSlider                *panning                = nullptr;
-	QSpinBox               *syncOffset             = nullptr;
-	QCheckBox              *mediaChannel1          = nullptr;
-	QCheckBox              *mediaChannel2          = nullptr;
-	QCheckBox              *mediaChannel3          = nullptr;
-	QCheckBox              *mediaChannel4          = nullptr;
+
+	QPointer<QWidget>      forceMonoContainer;
+	QPointer<QWidget>      mixerContainer;
+	QPointer<QWidget>      panningContainer;
+
+	QPointer<QLabel>       nameLabel;
+	QPointer<QSpinBox>     volume;
+	QPointer<QCheckBox>    forceMono;
+	QPointer<QSlider>      panning;
+	QPointer<QLabel>       labelL;
+	QPointer<QLabel>       labelR;
+	QPointer<QSpinBox>     syncOffset;
+	QPointer<QCheckBox>    mixer1;
+	QPointer<QCheckBox>    mixer2;
+	QPointer<QCheckBox>    mixer3;
+	QPointer<QCheckBox>    mixer4;
 
 	OBSSignal              volChangedSignal;
 	OBSSignal              syncOffsetSignal;
 	OBSSignal              flagsSignal;
+	OBSSignal              mixersSignal;
 
 	static void OBSSourceFlagsChanged(void *param, calldata_t *calldata);
 	static void OBSSourceVolumeChanged(void *param, calldata_t *calldata);
 	static void OBSSourceSyncChanged(void *param, calldata_t *calldata);
+	static void OBSSourceMixersChanged(void *param, calldata_t *calldata);
 
 public:
-	OBSAdvAudioCtrl(obs_source_t *source_);
+	OBSAdvAudioCtrl(QGridLayout *layout, obs_source_t *source_);
+	virtual ~OBSAdvAudioCtrl();
 
 	inline obs_source_t *GetSource() const {return source;}
 
@@ -40,13 +52,14 @@
 	void SourceFlagsChanged(uint32_t flags);
 	void SourceVolumeChanged(float volume);
 	void SourceSyncChanged(int64_t offset);
+	void SourceMixersChanged(uint32_t mixers);
 
 	void volumeChanged(int percentage);
 	void downmixMonoChanged(bool checked);
 	void panningChanged(int val);
 	void syncOffsetChanged(int milliseconds);
-	void mediaChannel1Changed(bool checked);
-	void mediaChannel2Changed(bool checked);
-	void mediaChannel3Changed(bool checked);
-	void mediaChannel4Changed(bool checked);
+	void mixer1Changed(bool checked);
+	void mixer2Changed(bool checked);
+	void mixer3Changed(bool checked);
+	void mixer4Changed(bool checked);
 };

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/obs/data/locale/ar-SA.ini -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/obs/data/locale/ar-SA.ini Changed

@@ -25,6 +25,7 @@
 NameExists.Text="الاسم مستخدم حاليا."
 
 
+
 ConfirmRemove.Title="تأكيد الإزالة"
 ConfirmRemove.Text="هل أنت متأكد من رغبتك في إزالة '$1' ?"
 
@@ -163,8 +164,6 @@
 
 Basic.Settings.Output="المخرج"
 Basic.Settings.Output.Mode="نوع المخرج"
-Basic.Settings.Output.Mode.Simple="بسيط (بث و/أو تسجيل)"
-Basic.Settings.Output.Mode.Advanced="متقدم (أنواع إخراج مخصصة)"
 Basic.Settings.Output.Simple.SavePath="مسار تسجيل FLV"
 Basic.Settings.Output.VideoBitrate="معدل البت للفيديو"
 Basic.Settings.Output.AudioBitrate="معدل البت للصوت"
@@ -172,6 +171,8 @@
 Basic.Settings.Output.RetryDelay="إعادة محاولة تأخير (ثوان)"
 Basic.Settings.Output.MaxRetries="أقصى عدد للمحاولات"
 
+
+
 Basic.Settings.Video="الفيديو"
 Basic.Settings.Video.Adapter="محول الفيديو:"
 Basic.Settings.Video.BaseResolution="قاعدة الأبعاد:"
@@ -188,6 +189,7 @@
 Basic.Settings.Video.InvalidResolution="قيمة الأبعاد غير صالحة.  يجب أن يكون [العرض] x [الطول] (مثال. 1920 × 1080)"
 Basic.Settings.Video.CurrentlyActive="إخراج الفيديو نشط حاليا. الرجاء إيقاف كل الإخراجات لتغيير إعدادات الفيديو."
 
+
 Basic.Settings.Audio="الصوت"
 Basic.Settings.Audio.SampleRate="معدل العينات"
 Basic.Settings.Audio.Channels="قنوات"
@@ -197,3 +199,5 @@
 Basic.Settings.Audio.AuxDevice2="جهاز صوت Mic/Auxiliary 2"
 Basic.Settings.Audio.AuxDevice3="جهاز صوت Mic/Auxiliary 3"
 
+
+

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/obs/data/locale/bg-BG.ini -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/obs/data/locale/bg-BG.ini Changed

@@ -25,6 +25,7 @@
 NameExists.Text="Името е вече използвано."
 
 
+
 ConfirmRemove.Title="Потвърди премахване"
 ConfirmRemove.Text="Наистина ли искате да премахнете \"$1\"?"
 
@@ -159,8 +160,6 @@
 
 Basic.Settings.Output="Излъчване"
 Basic.Settings.Output.Mode="Режим на излъчване"
-Basic.Settings.Output.Mode.Simple="Прост (Стрийм и/или записване)"
-Basic.Settings.Output.Mode.Advanced="Разширен (Персонализиран тип на излъчване)"
 Basic.Settings.Output.Simple.SavePath="FLV път за запис"
 Basic.Settings.Output.VideoBitrate="Видео битрейт"
 Basic.Settings.Output.AudioBitrate="Аудио битрейт"
@@ -168,6 +167,8 @@
 Basic.Settings.Output.RetryDelay="Отлагане на повторно свързване (секунди)"
 Basic.Settings.Output.MaxRetries="Максимален брой повторни опити"
 
+
+
 Basic.Settings.Video="Видео"
 Basic.Settings.Video.Adapter="Видео адаптер:"
 Basic.Settings.Video.BaseResolution="Базова резолюция:"
@@ -183,6 +184,7 @@
 Basic.Settings.Video.InvalidResolution="Невалидна резолюция. Трябва да бъде [ширина] x [височина] (пример: 1920 x 1080)"
 Basic.Settings.Video.CurrentlyActive="В момента излъчвате. Моля спрете излъчването за да промените видео настройките."
 
+
 Basic.Settings.Audio="Аудио"
 Basic.Settings.Audio.SampleRate="Честота на дискретизацията"
 Basic.Settings.Audio.Channels="Канали"
@@ -192,3 +194,5 @@
 Basic.Settings.Audio.AuxDevice2="Микрофон/Вторично аудио устройство 2"
 Basic.Settings.Audio.AuxDevice3="Микрофон/Вторично аудио устройство 3"
 
+
+

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/obs/data/locale/cs-CZ.ini -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/obs/data/locale/cs-CZ.ini Changed

@@ -24,18 +24,45 @@
 NameExists.Title="Jméno již existuje"
 NameExists.Text="Toto jméno již bylo použito."
 
+NoNameEntered.Title="Zadejte prosím platné jméno"
+NoNameEntered.Text="Jméno nesmí být prázdné."
+
 
 ConfirmRemove.Title="Potvrzení odebrání"
 ConfirmRemove.Text="Opravdu si přejete odebrat '$1'?"
 
 Output.ConnectFail.Title="Spojení se nezdařilo"
+Output.ConnectFail.BadPath="Chybná cesta nebo adresa připojení. Zkontrolujte, prosím, správnost svých nastavení."
+Output.ConnectFail.ConnectFailed="K serveru se nepodařilo připojit"
 Output.ConnectFail.Disconnected="Odpojen od serveru."
 
+Output.BadPath.Title="Špatná cesta k souboru"
 
+LogReturnDialog="Záznam byl úspěšně nahrán"
 LogReturnDialog.CopyURL="Zkopírovat URL"
-
-
-
+LogReturnDialog.ErrorUploadingLog="Nahrání záznamu se nezdařilo"
+
+LicenseAgreement="Licenční smlouva"
+LicenseAgreement.PleaseReview="Před použitím OBS si, prosím, přečtěte licenční podmínky. Použitím tohoto programu potvrzujete, že jste si přečetl/a a souhlasíte s podmínkami <a href='http://www.gnu.org/licenses/gpl-2.0.html'>GNU General Public License v2.0</a>. Pro zobrazení zbytku ujednání sjeďte dolů."
+LicenseAgreement.ClickIAgreeToContinue="Pro pokračování klikněte na Souhlasím, pokud souhlasíte s podmínkami ujednání. Před použitím OBS je toto nutné odsouhlasit."
+LicenseAgreement.IAgree="Souhlasím"
+LicenseAgreement.Exit="Konec"
+
+Remux.SourceFile="Nahrávání OBS"
+Remux.TargetFile="Cílový soubor"
+Remux.Remux="Remuxovat"
+Remux.FinishedTitle="Remuxování dokončeno"
+Remux.Finished="Nahrávka remuxována"
+Remux.FinishedError="Nahrávka remuxována, ale soubor nemusí být kompletní"
+Remux.SelectRecording="Vyberte OBS nahrávku …"
+Remux.SelectTarget="Vyberte cílový soubor …"
+Remux.FileExistsTitle="Cílový soubor existuje"
+Remux.FileExists="Cílový soubor existuje, chcete jej nahradit ?"
+Remux.ExitUnfinishedTitle="Probíhá remuxování"
+Remux.ExitUnfinished="Remuxování není dokončeno, ukončení procesu může znemožnit další použití cílového souboru.\nOpravdu chcete tento proces zastavit?"
+
+UpdateAvailable="K dispozici je nová verze"
+UpdateAvailable.Text="Verze %1.%2.%3 je nyní k dispozici.  <a href='%4'>Stáhnout</a>"
 
 
 Basic.Scene="Scéna"
@@ -45,17 +72,27 @@
 
 Basic.Main.DefaultSceneName.Text="Scéna %1"
 
+Basic.SourceSelect="Vytvořit/vybrat zdroj"
 Basic.SourceSelect.CreateNew="Vytvořit nový"
 Basic.SourceSelect.AddExisting="Přidat existující"
 
+Basic.PropertiesWindow="Vlastnosti pro '%1'"
 Basic.PropertiesWindow.AutoSelectFormat="%1 (nepodporováno; auto-výběr: %2)"
+Basic.PropertiesWindow.SelectColor="Výběr barvy"
+Basic.PropertiesWindow.SelectFont="Výběr písma"
 
 
 
+Basic.TransformWindow.Position="Umístění"
+Basic.TransformWindow.Rotation="Otočení"
+Basic.TransformWindow.Size="Velikost"
 
 
 
 
+Basic.Main.Scenes="Scény"
+Basic.Main.Sources="Zdroje"
+Basic.Main.Connecting="Připojování..."
 
 Basic.MainMenu.File="&Soubor"
 
@@ -67,3 +104,8 @@
 
 
 
+
+
+
+
+

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/obs/data/locale/da-DK.ini -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/obs/data/locale/da-DK.ini Changed

@@ -5,6 +5,8 @@
 OK="OK"
 Apply="Anvend"
 Cancel="Annuller"
+Save="Gem"
+Discard="Kassér"
 Yes="Ja"
 No="Nej"
 Add="Tilføj"
@@ -14,6 +16,7 @@
 MoveUp="Flyt Op"
 MoveDown="Flyt Ned"
 Settings="Indstillinger"
+Name="Navn"
 Exit="Afslut"
 Mixer="Mixer"
 Browse="Browse"
@@ -27,6 +30,9 @@
 NoNameEntered.Title="Indtast venligst et gyldigt navn"
 NoNameEntered.Text="Du kan ikke bruge tomme navne."
 
+ConfirmExit.Title="Forlad OBS?"
+ConfirmExit.Text="OBS er i øjeblikket aktivt.  Er du sikker på du ønsker at forlade det?"
+
 ConfirmRemove.Title="Bekræfte Fjern"
 ConfirmRemove.Text="Er du sikker på du ønsker at fjerne '$1'?"
 
@@ -90,6 +96,8 @@
 Basic.PropertiesWindow.AutoSelectFormat="%1 (ikke understøttet; autoselect: %2)"
 Basic.PropertiesWindow.SelectColor="Vælg farve"
 Basic.PropertiesWindow.SelectFont="Vælg skrifttype"
+Basic.PropertiesWindow.ConfirmTitle="Indstillinger ændret"
+Basic.PropertiesWindow.Confirm="Der er ændringer, som ikke er gemt.  Vil du gerne beholde dem?"
 
 Basic.InteractionWindow="Interagere med '%1'"
 
@@ -163,6 +171,7 @@
 Basic.MainMenu.Edit.Order.MoveDown="Flyt Ned (&D)"
 Basic.MainMenu.Edit.Order.MoveToTop="Flyt til &Toppen"
 Basic.MainMenu.Edit.Order.MoveToBottom="Flyt til &Bunden"
+Basic.MainMenu.Edit.AdvAudio="&Avancerede lydegenskaber"
 
 Basic.MainMenu.Help="&Hjælp"
 Basic.MainMenu.Help.Logs="&Logfiler"
@@ -182,9 +191,13 @@
 Basic.Settings.Stream.StreamType="Stream Type"
 
 Basic.Settings.Output="Output"
+Basic.Settings.Output.Encoder="Encoder"
+Basic.Settings.Output.SelectDirectory="Vælg optagelsesmappe"
+Basic.Settings.Output.SelectFile="Vælg optagelsesfil"
 Basic.Settings.Output.Mode="Output Mode"
-Basic.Settings.Output.Mode.Simple="Enkel (Stream og/eller record)"
-Basic.Settings.Output.Mode.Advanced="Avanceret (brugerdefinerede outputtype)"
+Basic.Settings.Output.Mode.Simple="Simpel"
+Basic.Settings.Output.Mode.Adv="Avanceret"
+Basic.Settings.Output.Mode.FFmpeg="FFmpeg output"
 Basic.Settings.Output.Simple.SavePath="FLV Recording sti"
 Basic.Settings.Output.VideoBitrate="Video Bitrate"
 Basic.Settings.Output.AudioBitrate="Audio Bitrate"
@@ -192,10 +205,23 @@
 Basic.Settings.Output.RetryDelay="Retry forsinkelse (sekunder)"
 Basic.Settings.Output.MaxRetries="Maksimum forsøg"
 Basic.Settings.Output.Advanced="Aktivere avancerede Encoder indstillinger"
-Basic.Settings.Output.X264Preset="x264 preset"
-Basic.Settings.Output.CustomX264Settings="Brugerdefinerede x264 indstillinger"
 Basic.Settings.Output.UseCBR="Brug konstant bitrate"
 
+Basic.Settings.Output.Adv.AudioTrack="Lydspor"
+Basic.Settings.Output.Adv.Streaming="Streaming"
+Basic.Settings.Output.Adv.ApplyServiceSettings="Håndhæv streaming service encoder indstillinger"
+Basic.Settings.Output.Adv.Audio.Track1="Spor 1"
+Basic.Settings.Output.Adv.Audio.Track2="Spor 2"
+Basic.Settings.Output.Adv.Audio.Track3="Spor 3"
+Basic.Settings.Output.Adv.Audio.Track4="Spor 4"
+
+Basic.Settings.Output.Adv.Recording="Optagelse"
+Basic.Settings.Output.Adv.Recording.Type="Type"
+Basic.Settings.Output.Adv.Recording.Type.Standard="Standard"
+Basic.Settings.Output.Adv.Recording.UseStreamEncoder="(Brug stream encoder)"
+Basic.Settings.Output.Adv.FFmpeg.SaveFilter.All="Alle filer"
+Basic.Settings.Output.Adv.FFmpeg.SavePathURL="Filsti eller URL"
+
 Basic.Settings.Video="Video"
 Basic.Settings.Video.Adapter="Skærmkort:"
 Basic.Settings.Video.BaseResolution="Basis Opløsning:"
@@ -212,6 +238,7 @@
 Basic.Settings.Video.InvalidResolution="Ugyldig opløsningsværdi.  Skal være [bredde] x [højde] (dvs. 1920 x 1080)"
 Basic.Settings.Video.CurrentlyActive="Video output er aktiv i øjeblikket.  Venligst slukke eventuelle udgange til at ændre videoindstillinger."
 
+
 Basic.Settings.Audio="Lyd"
 Basic.Settings.Audio.SampleRate="Sample Rate"
 Basic.Settings.Audio.Channels="Kanaler"
@@ -221,3 +248,14 @@
 Basic.Settings.Audio.AuxDevice2="Mic/Auxiliary lydenhed 2"
 Basic.Settings.Audio.AuxDevice3="Mic/Auxiliary lydenhed 3"
 
+Basic.Settings.Advanced="Avanceret"
+Basic.Settings.Advanced.Video.ColorFormat="Farveformat"
+Basic.Settings.Advanced.Video.ColorRange.Partial="Delvis"
+Basic.Settings.Advanced.Video.ColorRange.Full="Fuld"
+
+Basic.AdvAudio="Avancerede lydegenskaber"
+Basic.AdvAudio.Name="Navn"
+Basic.AdvAudio.Volume="Volumen (%)"
+Basic.AdvAudio.Panning="Panorering"
+Basic.AdvAudio.AudioTracks="Spor"
+

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/obs/data/locale/de-DE.ini -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/obs/data/locale/de-DE.ini Changed

@@ -5,6 +5,8 @@
 OK="OK"
 Apply="Anwenden"
 Cancel="Abbrechen"
+Save="Speichern"
+Discard="Verwerfen"
 Yes="Ja"
 No="Nein"
 Add="Hinzufügen"
@@ -14,6 +16,7 @@
 MoveUp="Nach oben bewegen"
 MoveDown="Nach unten bewegen"
 Settings="Einstellungen"
+Name="Name"
 Exit="Beenden"
 Mixer="Mixer"
 Browse="Durchsuchen"
@@ -27,14 +30,17 @@
 NoNameEntered.Title="Bitte geben Sie einen gültigen Namen ein"
 NoNameEntered.Text="Sie können leere Namen nicht verwenden."
 
+ConfirmExit.Title="OBS beenden?"
+ConfirmExit.Text="OBS ist derzeit aktiv.  Sind Sie sicher, dass Sie die Anwendung beenden wollen?"
+
 ConfirmRemove.Title="Entfernen bestätigen"
 ConfirmRemove.Text="Sind Sie sicher, dass Sie '$1' entfernen möchten?"
 
-Output.ConnectFail.Title="Verbindung fehlgeschalgen"
-Output.ConnectFail.BadPath="Ungültiger Pfad oder Verbindungs URL. Bitte überprüfen Sie Ihre Einstellungen und stellen Sie sicher, dass sie gültig sind."
+Output.ConnectFail.Title="Verbindung fehlgeschlagen"
+Output.ConnectFail.BadPath="Ungültiger Pfad oder Verbindungs-URL. Bitte überprüfen Sie Ihre Einstellungen und stellen Sie sicher, dass sie gültig sind."
 Output.ConnectFail.ConnectFailed="Verbindung zum Server fehlgeschlagen"
 Output.ConnectFail.InvalidStream="Konnte auf den angegebenen Kanal oder Streamschlüssel nicht zugreifen. Dies kann daran liegen, dass der Schlüssel oder Kanal ungültig ist, oder der Server noch denkt, dass Sie angemeldet bist."
-Output.ConnectFail.Error="Ein unerwarteter Fehler ist beim Verbindungsversuch zum Server aufgetreten. Mehr Informationen in der Logdatei."
+Output.ConnectFail.Error="Ein unerwarteter Fehler ist beim Verbindungsversuch zum Server aufgetreten. Mehr Informationen finden Sie in der Logdatei."
 Output.ConnectFail.Disconnected="Verbindung zum Server getrennt."
 
 Output.BadPath.Title="Ungültiger Dateipfad"
@@ -45,7 +51,7 @@
 LogReturnDialog.ErrorUploadingLog="Fehler beim Upload der Logdatei"
 
 LicenseAgreement="Lizenzvereinbarung"
-LicenseAgreement.PleaseReview="Bitte lesen Sie die Lizenzbedingungen vor der Verwendung von OBS.  Mit dem verwenden dieses Programms, bestätigen Sie, dass Sie sie gelesen haben und den Bedingungen der <a href='http://www.gnu.org/licenses/gpl-2.0.html'>GNU General Public License v2.0</a> zustimmen. Bitte scrollen Sie nach unten, um den Rest der Vereinbarung zu sehen."
+LicenseAgreement.PleaseReview="Bitte lesen Sie die Lizenzbedingungen vor der Verwendung von OBS.  Mit dem verwenden dieses Programms, bestätigen Sie, dass Sie diese gelesen haben und den Bedingungen der <a href='http://www.gnu.org/licenses/gpl-2.0.html'>GNU General Public License v2.0</a> zustimmen. Bitte scrollen Sie nach unten, um den Rest der Vereinbarung zu sehen."
 LicenseAgreement.ClickIAgreeToContinue="Wenn Sie die Vereinbarung akzeptieren, klicken Sie auf ich stimme zu, um fortzufahren.  Sie müssen akzeptieren, um OBS verwenden zu können."
 LicenseAgreement.IAgree="Ich stimme zu"
 LicenseAgreement.Exit="Beenden"
@@ -60,9 +66,9 @@
 Remux.SelectRecording="Wählen Sie die OBS Aufnahme aus …"
 Remux.SelectTarget="Wähle Zieldatei …"
 Remux.FileExistsTitle="Zieldatei ist bereits vorhanden"
-Remux.FileExists="Zieldatei ist bereits vorhanden, möchten Sie sie ersetzen?"
+Remux.FileExists="Zieldatei ist bereits vorhanden. Möchten Sie diese ersetzen?"
 Remux.ExitUnfinishedTitle="Remuxen in Bearbeitung"
-Remux.ExitUnfinished="Remuxen ist noch nicht fertig, wenn Sie jetzt stoppen kann die Zieldatei unbrauchbar werden. \nSind Sie sicher, dass Sie das Remuxen beenden möchten?"
+Remux.ExitUnfinished="Das Remuxen ist noch nicht fertig. Wenn Sie jetzt stoppen, kann die Zieldatei unbrauchbar werden. \nSind Sie sicher, dass Sie das Remuxen beenden möchten?"
 
 UpdateAvailable="Neues Update verfügbar"
 UpdateAvailable.Text="Version %1.%2.%3 ist nun verfügbar.  <a href='%4'>Hier klicken zum Download</a>"
@@ -84,12 +90,14 @@
 
 Basic.SourceSelect="Quelle erstellen/auswählen"
 Basic.SourceSelect.CreateNew="Neu erstellen"
-Basic.SourceSelect.AddExisting="Existierender hinzufügen"
+Basic.SourceSelect.AddExisting="Existierende hinzufügen"
 
 Basic.PropertiesWindow="Eigenschaften für '%1'"
 Basic.PropertiesWindow.AutoSelectFormat="%1 (nicht unterstützt; automatisch ausgewählt: %2)"
 Basic.PropertiesWindow.SelectColor="Farbe auswählen"
 Basic.PropertiesWindow.SelectFont="Schriftart auswählen"
+Basic.PropertiesWindow.ConfirmTitle="Einstellungen geändert"
+Basic.PropertiesWindow.Confirm="Es gibt ungesicherte Änderungen. Möchten Sie diese behalten?"
 
 Basic.InteractionWindow="Interagiere mit '%1'"
 
@@ -124,7 +132,7 @@
 Basic.TransformWindow.BoundsType.Stretch="Bis zu den Begrenzungen strecken"
 
 Basic.Main.AddSourceHelp.Title="Konnte Quelle nicht hinzufügen"
-Basic.Main.AddSourceHelp.Text="Sie müssen mindestens 1 Szene besitzen um eine Quelle hinzuzufügen."
+Basic.Main.AddSourceHelp.Text="Sie müssen mindestens 1 Szene besitzen, um eine Quelle hinzuzufügen."
 
 Basic.Main.Scenes="Szenen"
 Basic.Main.Sources="Quellen"
@@ -152,7 +160,7 @@
 Basic.MainMenu.Edit.Transform.ResetTransform="Transformation zu&rücksetzen"
 Basic.MainMenu.Edit.Transform.Rotate90CW="Um 90° im Uhrzeigersinn drehen"
 Basic.MainMenu.Edit.Transform.Rotate90CCW="Um 90° gegen den Uhrzeigersinn drehen"
-Basic.MainMenu.Edit.Transform.Rotate180="Um 180 Grad drehen"
+Basic.MainMenu.Edit.Transform.Rotate180="Um 180° drehen"
 Basic.MainMenu.Edit.Transform.FlipHorizontal="&Horizontal spiegeln"
 Basic.MainMenu.Edit.Transform.FlipVertical="&Vertikal spiegeln"
 Basic.MainMenu.Edit.Transform.FitToScreen="An Bildschirmgröße anpassen (&F)"
@@ -163,6 +171,7 @@
 Basic.MainMenu.Edit.Order.MoveDown="Nach unten bewegen (&D)"
 Basic.MainMenu.Edit.Order.MoveToTop="Ganz nach oben bewegen (&T)"
 Basic.MainMenu.Edit.Order.MoveToBottom="Ganz nach unten &bewegen"
+Basic.MainMenu.Edit.AdvAudio="Erweiterte &Audioeigenschaften"
 
 Basic.MainMenu.Help="&Hilfe"
 Basic.MainMenu.Help.Logs="&Logdateien"
@@ -182,9 +191,13 @@
 Basic.Settings.Stream.StreamType="Stream Typ"
 
 Basic.Settings.Output="Ausgabe"
-Basic.Settings.Output.Mode="Output Modus"
-Basic.Settings.Output.Mode.Simple="Einfach (Streamen und/oder Aufnehmen)"
-Basic.Settings.Output.Mode.Advanced="Fortgeschritten (Benutzerdefinierter Ausgabetyp)"
+Basic.Settings.Output.Encoder="Encoder"
+Basic.Settings.Output.SelectDirectory="Wählen Sie das Aufnahmeverzeichnis"
+Basic.Settings.Output.SelectFile="Wählen Sie die Aufnahmedatei"
+Basic.Settings.Output.Mode="Ausgabemodus"
+Basic.Settings.Output.Mode.Simple="Einfach"
+Basic.Settings.Output.Mode.Adv="Erweitert"
+Basic.Settings.Output.Mode.FFmpeg="FFmpeg Ausgabe"
 Basic.Settings.Output.Simple.SavePath="FLV Aufnahmepfad"
 Basic.Settings.Output.VideoBitrate="Video-Bitrate"
 Basic.Settings.Output.AudioBitrate="Audio-Bitrate"
@@ -192,9 +205,32 @@
 Basic.Settings.Output.RetryDelay="Wiederverbindungsverzögerung (Sekunden)"
 Basic.Settings.Output.MaxRetries="Maximale Wiederholungsversuche"
 Basic.Settings.Output.Advanced="Erweiterte Encoder-Einstellungen aktivieren"
-Basic.Settings.Output.X264Preset="x264 Voreinstellung"
-Basic.Settings.Output.CustomX264Settings="Benutzerdefinierte x264 Einstellungen"
-Basic.Settings.Output.UseCBR="Benutze Konstante Bitrate"
+Basic.Settings.Output.EncoderPreset="Encoder-Voreinstellung (höher = weniger CPU Auslastung)"
+Basic.Settings.Output.CustomEncoderSettings="Benutzerdefinierte Encoder-Einstellungen"
+Basic.Settings.Output.UseCBR="Benutze konstante Bitrate"
+Basic.Settings.Output.UseBufferSize="Benutzerdefinierte Puffergröße"
+
+Basic.Settings.Output.Adv.Rescale="Ausgabe umskalieren"
+Basic.Settings.Output.Adv.AudioTrack="Audiospur"
+Basic.Settings.Output.Adv.Streaming="Streamen"
+Basic.Settings.Output.Adv.ApplyServiceSettings="Erzwinge Streamingdienst-Encodereinstellungen"
+Basic.Settings.Output.Adv.Audio.Track1="Spur 1"
+Basic.Settings.Output.Adv.Audio.Track2="Spur 2"
+Basic.Settings.Output.Adv.Audio.Track3="Spur 3"
+Basic.Settings.Output.Adv.Audio.Track4="Spur 4"
+
+Basic.Settings.Output.Adv.Recording="Aufnehmen"
+Basic.Settings.Output.Adv.Recording.Type="Art"
+Basic.Settings.Output.Adv.Recording.Type.Standard="Normal"
+Basic.Settings.Output.Adv.Recording.Type.FFmpegOutput="Benutzerdefinierte Ausgabe (FFmpeg)"
+Basic.Settings.Output.Adv.Recording.UseStreamEncoder="(Benutze Streamencoder)"
+Basic.Settings.Output.Adv.FFmpeg.SaveFilter.Common="Häufige Aufnahmeformate"
+Basic.Settings.Output.Adv.FFmpeg.SaveFilter.All="Alle Dateien"
+Basic.Settings.Output.Adv.FFmpeg.SavePathURL="Dateipfad oder URL"
+Basic.Settings.Output.Adv.FFmpeg.VEncoder="Video-Encoder (leer = Standard)"
+Basic.Settings.Output.Adv.FFmpeg.VEncoderSettings="Video Encoder-Einstellungen (falls gewünscht)"
+Basic.Settings.Output.Adv.FFmpeg.AEncoder="Audio-Encoder (leer = Standard)"
+Basic.Settings.Output.Adv.FFmpeg.AEncoderSettings="Audio Encoder-Einstellungen (falls gewünscht)"
 
 Basic.Settings.Video="Video"
 Basic.Settings.Video.Adapter="Grafikkarte:"
@@ -210,14 +246,34 @@
 Basic.Settings.Video.Denominator="Nenner:"
 Basic.Settings.Video.Renderer="Renderer:"
 Basic.Settings.Video.InvalidResolution="Ungültige Auflösung. Muss sein [Breite]x[Höhe] (z.B. 1920x1080)"
-Basic.Settings.Video.CurrentlyActive="Videoausgabe ist derzeit aktiv. Bitte schalten Sie alle Ausgaben ab um die Videoeinstellungen zu ändern."
+Basic.Settings.Video.CurrentlyActive="Videoausgabe ist derzeit aktiv. Bitte schalten Sie alle Ausgaben ab, um die Videoeinstellungen zu ändern."
+
+Basic.Settings.Video.DownscaleFilter.Bilinear="Bilinear (am schnellsten, aber Unscharf bei Skalierung)"
+Basic.Settings.Video.DownscaleFilter.Bicubic="Bicubic (geschärfte Skalierung, 16 Stichproben)"
+Basic.Settings.Video.DownscaleFilter.Lanczos="Lanczos (geschärfte Skalierung, 32 Stichproben)"
 
 Basic.Settings.Audio="Audio"
 Basic.Settings.Audio.SampleRate="Abtastrate"
 Basic.Settings.Audio.Channels="Kanäle"
-Basic.Settings.Audio.DesktopDevice="Desktop Audio Gerät"
-Basic.Settings.Audio.DesktopDevice2="Desktop Audio Gerät 2"
-Basic.Settings.Audio.AuxDevice="Mikrofon/Extern Audio Gerät"
-Basic.Settings.Audio.AuxDevice2="Mikrofon/Extern Audio Gerät 2"
-Basic.Settings.Audio.AuxDevice3="Mikrofon/Extern Audio Gerät 3"
+Basic.Settings.Audio.DesktopDevice="Desktop Audiogerät"
+Basic.Settings.Audio.DesktopDevice2="Desktop Audiogerät 2"
+Basic.Settings.Audio.AuxDevice="Mikrofon/Externes Audiogerät"
+Basic.Settings.Audio.AuxDevice2="Mikrofon/Externes Audiogerät 2"
+Basic.Settings.Audio.AuxDevice3="Mikrofon/Externes Audiogerät 3"
+
+Basic.Settings.Advanced="Erweitert"
+Basic.Settings.Advanced.Audio.BufferingTime="Audio Pufferungszeit"
+Basic.Settings.Advanced.Video.ColorFormat="Farbformat"
+Basic.Settings.Advanced.Video.ColorSpace="YUV-Farbraum"
+Basic.Settings.Advanced.Video.ColorRange="YUV Farbpalette"
+Basic.Settings.Advanced.Video.ColorRange.Partial="Teilweise"
+Basic.Settings.Advanced.Video.ColorRange.Full="Voll"
+
+Basic.AdvAudio="Erweiterte Audioeigenschaften"
+Basic.AdvAudio.Name="Name"
+Basic.AdvAudio.Volume="Lautstärke (%)"
+Basic.AdvAudio.Mono="Heruntermischen zu Mono"
+Basic.AdvAudio.Panning="Schwenken"
+Basic.AdvAudio.SyncOffset="Sync Verschiebung (ms)"
+Basic.AdvAudio.AudioTracks="Spuren"

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/obs/data/locale/el-GR.ini -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/obs/data/locale/el-GR.ini Changed

@@ -5,6 +5,8 @@
 OK="ΟΚ"
 Apply="Εφαρμογή"
 Cancel="Ακύρωση"
+Save="Αποθήκευση"
+Discard="Απόρριψη"
 Yes="Ναι"
 No="Όχι"
 Add="Προσθήκη"
@@ -14,6 +16,7 @@
 MoveUp="Μετακίνηση Πάνω"
 MoveDown="Μετακίνηση Κάτω"
 Settings="Ρυθμίσεις"
+Name="Όνομα"
 Exit="Έξοδος"
 Mixer="Μίξερ"
 Browse="Αναζήτηση"
@@ -27,6 +30,9 @@
 NoNameEntered.Title="Πληκτρολογήστε ένα έγκυρο όνομα"
 NoNameEntered.Text="Δεν μπορείτε να χρησιμοποιήσετε κενά ονόματα."
 
+ConfirmExit.Title="Έξοδος από το OBS;"
+ConfirmExit.Text="Το OBS είναι ενεργό αυτή τη στιγμή. Είστε σίγουροι ότι θέλετε να το κλείσετε;"
+
 ConfirmRemove.Title="Επιβεβαίωση Αφαίρεσης"
 ConfirmRemove.Text="Είστε βέβαιοι ότι θέλετε να καταργήσετε \"$1\";"
 
@@ -90,6 +96,8 @@
 Basic.PropertiesWindow.AutoSelectFormat="%1 (μη υποστηριζόμενη; autoselect: %2)"
 Basic.PropertiesWindow.SelectColor="Επιλέξτε χρώμα"
 Basic.PropertiesWindow.SelectFont="Επιλέξτε γραμματοσειρά"
+Basic.PropertiesWindow.ConfirmTitle="Άλλαξαν οι Ρυθμίσεις"
+Basic.PropertiesWindow.Confirm="Υπάρχουν μη αποθηκευμένες αλλαγές.  Θέλετε να τις κρατήσετε;"
 
 Basic.InteractionWindow="Αλληλεπίδραση με '%1'"
 
@@ -129,9 +137,9 @@
 Basic.Main.Scenes="Σκηνές"
 Basic.Main.Sources="Πηγές"
 Basic.Main.Connecting="Σύνδεση..."
-Basic.Main.StartRecording="Έναρξη Ηχογράφησης"
+Basic.Main.StartRecording="Έναρξη Καταγραφής"
 Basic.Main.StartStreaming="Έναρξη Μετάδοσης"
-Basic.Main.StopRecording="Διακοπή Ηχογράφησης"
+Basic.Main.StopRecording="Διακοπή Καταγραφής"
 Basic.Main.StopStreaming="Διακοπή Μετάδοσης"
 
 Basic.MainMenu.File="Αρχείο(&F)"
@@ -163,6 +171,7 @@
 Basic.MainMenu.Edit.Order.MoveDown="Μετακίνηση Κάτω(&D)"
 Basic.MainMenu.Edit.Order.MoveToTop="Μετακίνηση στην Κορυφή(&T)"
 Basic.MainMenu.Edit.Order.MoveToBottom="Μετακίνηση τελέιως Κάτω(&B)"
+Basic.MainMenu.Edit.AdvAudio="Ιδιότητες(&A) Ήχου για Προχωρημένους"
 
 Basic.MainMenu.Help="Βοήθεια(&H)"
 Basic.MainMenu.Help.Logs="Αρχεία(&) Καταγραφής"
@@ -182,9 +191,12 @@
 Basic.Settings.Stream.StreamType="Τύπος Μετάδοσης"
 
 Basic.Settings.Output="Έξοδος"
+Basic.Settings.Output.Encoder="Κωδικοποιητής"
+Basic.Settings.Output.SelectDirectory="Επιλέξτε κατάλογο καταγραφής"
+Basic.Settings.Output.SelectFile="Επιλέξτε αρχείο καταγραφής"
 Basic.Settings.Output.Mode="Λειτουργία Εξόδου"
-Basic.Settings.Output.Mode.Simple="Απλό (Μετάδοση και/ή εγγραφή)"
-Basic.Settings.Output.Mode.Advanced="Προηγμένο (Προσαρμοσμένος τύπος εξόδου)"
+Basic.Settings.Output.Mode.Adv="Σύνθετες επιλογές"
+Basic.Settings.Output.Mode.FFmpeg="Έξοδος FFmpeg"
 Basic.Settings.Output.Simple.SavePath="Διαδρομή Καταγραφής FLV"
 Basic.Settings.Output.VideoBitrate="Ρυθμός Bit του Βίντεο"
 Basic.Settings.Output.AudioBitrate="Ρυθμός Bit του Ήχου"
@@ -192,9 +204,29 @@
 Basic.Settings.Output.RetryDelay="Καθυστέρηση Επανάληψης (δευτερόλεπτα)"
 Basic.Settings.Output.MaxRetries="Μέγιστος Αριθμός Επαναλήψεων"
 Basic.Settings.Output.Advanced="Ενεργοποίηση Ρυθμίσεις Κωδικοποιήτη Για Προχωρημένους"
-Basic.Settings.Output.X264Preset="Προφίλ x264"
-Basic.Settings.Output.CustomX264Settings="Προσαρμοσμένες Ρυθμίσεις x264"
+Basic.Settings.Output.EncoderPreset="Προφίλ Κωδικοποιητή (υψηλότερο = λιγότερη CPU)"
+Basic.Settings.Output.CustomEncoderSettings="Προσαρμοσμένες Ρυθμίσεις Κωδικοποιητή"
 Basic.Settings.Output.UseCBR="Χρήση Συνεχής Ροής Bit"
+Basic.Settings.Output.UseBufferSize="Χρήση Προσαρμοσμένου Μεγέθους Buffer"
+
+Basic.Settings.Output.Adv.Rescale="Κλιμάκωση Εξόδου"
+Basic.Settings.Output.Adv.AudioTrack="Κομμάτι ήχου"
+Basic.Settings.Output.Adv.ApplyServiceSettings="Επιβολή ρυθμίσεων κωδικοποιητή της υπηρεσίας streaming"
+Basic.Settings.Output.Adv.Audio.Track1="Κομμάτι 1"
+Basic.Settings.Output.Adv.Audio.Track2="Κομμάτι 2"
+Basic.Settings.Output.Adv.Audio.Track3="Κομμάτι 3"
+Basic.Settings.Output.Adv.Audio.Track4="Κομμάτι 4"
+
+Basic.Settings.Output.Adv.Recording.Type="Τύπος"
+Basic.Settings.Output.Adv.Recording.Type.FFmpegOutput="Προσαρμοσμένη Έξοδος (FFmpeg)"
+Basic.Settings.Output.Adv.Recording.UseStreamEncoder="(Χρήση κωδικοποιητή ροής)"
+Basic.Settings.Output.Adv.FFmpeg.SaveFilter.Common="Κοινή μορφές εγγραφής"
+Basic.Settings.Output.Adv.FFmpeg.SaveFilter.All="Όλα τα αρχεία"
+Basic.Settings.Output.Adv.FFmpeg.SavePathURL="Διαδρομή αρχείου ή URL"
+Basic.Settings.Output.Adv.FFmpeg.VEncoder="Κωδικοποιητής Βίντεο (κενό=προεπιλογή)"
+Basic.Settings.Output.Adv.FFmpeg.VEncoderSettings="Ρυθμίσεις Κωδικοποιητή Βίντεο (αν υπάρχουν)"
+Basic.Settings.Output.Adv.FFmpeg.AEncoder="Κωδικοποιητής Ήχου (κενό=προεπιλογή)"
+Basic.Settings.Output.Adv.FFmpeg.AEncoderSettings="Ρυθμίσεις Κωδικοποιητή Ήχου (αν υπάρχουν)"
 
 Basic.Settings.Video="Βίντεο"
 Basic.Settings.Video.Adapter="Προσαρμογέας Βίντεο:"
@@ -212,6 +244,10 @@
 Basic.Settings.Video.InvalidResolution="Μη έγκυρη τιμή ανάλυσης. Πρέπει να είναι [width]x[height] (π.χ. 1920x1080)"
 Basic.Settings.Video.CurrentlyActive="Δεν υπάρχει ενεργή έξοδος βίντεο. Παρακαλώ απενεργοποιήστε κάθε έξοδο για να αλλάξετε τις ρυθμίσεις βίντεο."
 
+Basic.Settings.Video.DownscaleFilter.Bilinear="Διγραμμικό (Πιο γρήγορο, αλλά θολό στην κλιμάκωση)"
+Basic.Settings.Video.DownscaleFilter.Bicubic="Δικυβικό (Οξυμμένη κλιμάκωση, 16 δείγματα)"
+Basic.Settings.Video.DownscaleFilter.Lanczos="Lanczos (Οξυμμένη κλιμάκωση, 32 δείγματα)"
+
 Basic.Settings.Audio="Ήχος"
 Basic.Settings.Audio.SampleRate="Ρυθμός Δειγματοληψίας"
 Basic.Settings.Audio.Channels="Κανάλια"
@@ -221,3 +257,12 @@
 Basic.Settings.Audio.AuxDevice2="Μικρόφωνο/Αuxillary Συσκευή Ήχου 2"
 Basic.Settings.Audio.AuxDevice3="Μικρόφωνο/Αuxillary Συσκευή Ήχου 3"
 
+
+Basic.AdvAudio="Ιδιότητες Ήχου για Προχωρημένους"
+Basic.AdvAudio.Name="Όνομα"
+Basic.AdvAudio.Volume="Ένταση (%)"
+Basic.AdvAudio.Mono="Αποκωδικοποίηση σε Mono"
+Basic.AdvAudio.Panning="Πανοραμικό"
+Basic.AdvAudio.SyncOffset="Μετατόπιση Συγχρονισμού (ms)"
+Basic.AdvAudio.AudioTracks="Κομμάτια"
+

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/obs/data/locale/en-US.ini -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/obs/data/locale/en-US.ini Changed

@@ -10,6 +10,8 @@
 OK="OK"
 Apply="Apply"
 Cancel="Cancel"
+Save="Save"
+Discard="Discard"
 Yes="Yes"
 No="No"
 Add="Add"
@@ -19,6 +21,7 @@
 MoveUp="Move Up"
 MoveDown="Move Down"
 Settings="Settings"
+Name="Name"
 Exit="Exit"
 Mixer="Mixer"
 Browse="Browse"
@@ -33,6 +36,10 @@
 NoNameEntered.Title="Please enter a valid name"
 NoNameEntered.Text="You cannot use empty names."
 
+# confirm exit dialog box
+ConfirmExit.Title="Exit OBS?"
+ConfirmExit.Text="OBS is currently active.  Are you sure you wish to exit?"
+
 # confirm delete dialog box
 ConfirmRemove.Title="Confirm Remove"
 ConfirmRemove.Text="Are you sure you wish to remove '$1'?"
@@ -109,6 +116,8 @@
 Basic.PropertiesWindow.AutoSelectFormat="%1 (unsupported; autoselect: %2)"
 Basic.PropertiesWindow.SelectColor="Select color"
 Basic.PropertiesWindow.SelectFont="Select font"
+Basic.PropertiesWindow.ConfirmTitle="Settings Changed"
+Basic.PropertiesWindow.Confirm="There are unsaved changes.  Do you want to keep them?"
 
 # interaction window
 Basic.InteractionWindow="Interacting with '%1'"
@@ -214,9 +223,13 @@
 
 # basic mode 'output' settings
 Basic.Settings.Output="Output"
+Basic.Settings.Output.Encoder="Encoder"
+Basic.Settings.Output.SelectDirectory="Select Recording Directory"
+Basic.Settings.Output.SelectFile="Select Recording File"
 Basic.Settings.Output.Mode="Output Mode"
-Basic.Settings.Output.Mode.Simple="Simple (Stream and/or record)"
-Basic.Settings.Output.Mode.Advanced="Advanced (Custom output type)"
+Basic.Settings.Output.Mode.Simple="Simple"
+Basic.Settings.Output.Mode.Adv="Advanced"
+Basic.Settings.Output.Mode.FFmpeg="FFmpeg Output"
 Basic.Settings.Output.Simple.SavePath="FLV Recording Path"
 Basic.Settings.Output.VideoBitrate="Video Bitrate"
 Basic.Settings.Output.AudioBitrate="Audio Bitrate"
@@ -224,9 +237,34 @@
 Basic.Settings.Output.RetryDelay="Retry Delay (seconds)"
 Basic.Settings.Output.MaxRetries="Maximum Retries"
 Basic.Settings.Output.Advanced="Enable Advanced Encoder Settings"
-Basic.Settings.Output.X264Preset="x264 Preset"
-Basic.Settings.Output.CustomX264Settings="Custom x264 Settings"
+Basic.Settings.Output.EncoderPreset="Encoder Preset (higher = less CPU)"
+Basic.Settings.Output.CustomEncoderSettings="Custom Encoder Settings"
 Basic.Settings.Output.UseCBR="Use Constant Bitrate"
+Basic.Settings.Output.UseBufferSize="Use Custom Buffer Size"
+
+# basic mode 'output' settings - advanced section
+Basic.Settings.Output.Adv.Rescale="Rescale Output"
+Basic.Settings.Output.Adv.AudioTrack="Audio Track"
+Basic.Settings.Output.Adv.Streaming="Streaming"
+Basic.Settings.Output.Adv.ApplyServiceSettings="Enforce streaming service encoder settings"
+Basic.Settings.Output.Adv.Audio.Track1="Track 1"
+Basic.Settings.Output.Adv.Audio.Track2="Track 2"
+Basic.Settings.Output.Adv.Audio.Track3="Track 3"
+Basic.Settings.Output.Adv.Audio.Track4="Track 4"
+
+# basic mode 'output' settings - advanced section - recording subsection
+Basic.Settings.Output.Adv.Recording="Recording"
+Basic.Settings.Output.Adv.Recording.Type="Type"
+Basic.Settings.Output.Adv.Recording.Type.Standard="Standard"
+Basic.Settings.Output.Adv.Recording.Type.FFmpegOutput="Custom Output (FFmpeg)"
+Basic.Settings.Output.Adv.Recording.UseStreamEncoder="(Use stream encoder)"
+Basic.Settings.Output.Adv.FFmpeg.SaveFilter.Common="Common recording formats"
+Basic.Settings.Output.Adv.FFmpeg.SaveFilter.All="All Files"
+Basic.Settings.Output.Adv.FFmpeg.SavePathURL="File path or URL"
+Basic.Settings.Output.Adv.FFmpeg.VEncoder="Video Encoder (blank=default)"
+Basic.Settings.Output.Adv.FFmpeg.VEncoderSettings="Video Encoder Settings (if any)"
+Basic.Settings.Output.Adv.FFmpeg.AEncoder="Audio Encoder (blank=default)"
+Basic.Settings.Output.Adv.FFmpeg.AEncoderSettings="Audio Encoder Settings (if any)"
 
 # basic mode 'video' settings
 Basic.Settings.Video="Video"
@@ -260,6 +298,15 @@
 Basic.Settings.Audio.AuxDevice2="Mic/Auxiliary Audio Device 2"
 Basic.Settings.Audio.AuxDevice3="Mic/Auxiliary Audio Device 3"
 
+# basic mode 'advanced' settings
+Basic.Settings.Advanced="Advanced"
+Basic.Settings.Advanced.Audio.BufferingTime="Audio Buffering Time"
+Basic.Settings.Advanced.Video.ColorFormat="Color Format"
+Basic.Settings.Advanced.Video.ColorSpace="YUV Color Space"
+Basic.Settings.Advanced.Video.ColorRange="YUV Color Range"
+Basic.Settings.Advanced.Video.ColorRange.Partial="Partial"
+Basic.Settings.Advanced.Video.ColorRange.Full="Full"
+
 # advanced audio properties
 Basic.AdvAudio="Advanced Audio Properties"
 Basic.AdvAudio.Name="Name"
@@ -267,4 +314,4 @@
 Basic.AdvAudio.Mono="Downmix to Mono"
 Basic.AdvAudio.Panning="Panning"
 Basic.AdvAudio.SyncOffset="Sync Offset (ms)"
-Basic.AdvAudio.MediaChannel="Media Channel"
+Basic.AdvAudio.AudioTracks="Tracks"

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/obs/data/locale/es-ES.ini -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/obs/data/locale/es-ES.ini Changed

@@ -5,6 +5,8 @@
 OK="Aceptar"
 Apply="Aplicar"
 Cancel="Cancelar"
+Save="Grabar"
+Discard="Descartar"
 Yes="Sí"
 No="No"
 Add="Agregar"
@@ -14,6 +16,7 @@
 MoveUp="Mover arriba"
 MoveDown="Mover abajo"
 Settings="Configuración"
+Name="Nombre"
 Exit="Salir"
 Mixer="Mezclador"
 Browse="Examinar"
@@ -27,6 +30,9 @@
 NoNameEntered.Title="Por favor, introduzca un nombre válido"
 NoNameEntered.Text="No puede utilizar nombres de vacíos."
 
+ConfirmExit.Title="¿Cerrar OBS?"
+ConfirmExit.Text="OBS está activo en este momento.  ¿Está seguro que desea salir?"
+
 ConfirmRemove.Title="Confirmar borrado"
 ConfirmRemove.Text="¿Seguro que desea eliminar '$1'?"
 
@@ -90,6 +96,8 @@
 Basic.PropertiesWindow.AutoSelectFormat="%1 (no soportado; seleccionar: %2)"
 Basic.PropertiesWindow.SelectColor="Seleccionar color"
 Basic.PropertiesWindow.SelectFont="Elija fuente"
+Basic.PropertiesWindow.ConfirmTitle="Configuración cambiada"
+Basic.PropertiesWindow.Confirm="Hay cambios sin guardar. ¿Deseas conservarlos?"
 
 Basic.InteractionWindow="Interactuando con '%1'"
 
@@ -163,6 +171,7 @@
 Basic.MainMenu.Edit.Order.MoveDown="Mover &abajo"
 Basic.MainMenu.Edit.Order.MoveToTop="Mover a la &cima"
 Basic.MainMenu.Edit.Order.MoveToBottom="Mover al &fondo"
+Basic.MainMenu.Edit.AdvAudio="Propiedades de &Audio avanzadas"
 
 Basic.MainMenu.Help="&Ayuda"
 Basic.MainMenu.Help.Logs="&Archivos de registro"
@@ -182,9 +191,13 @@
 Basic.Settings.Stream.StreamType="Tipo de flujo"
 
 Basic.Settings.Output="Salida"
+Basic.Settings.Output.Encoder="Codificador"
+Basic.Settings.Output.SelectDirectory="Seleccione Directorio de grabación"
+Basic.Settings.Output.SelectFile="Seleccione archivo de grabación"
 Basic.Settings.Output.Mode="Modo de salida"
-Basic.Settings.Output.Mode.Simple="Simple (Flujo y/o grabación)"
-Basic.Settings.Output.Mode.Advanced="Avanzado (Salida personalizada)"
+Basic.Settings.Output.Mode.Simple="Sencillo"
+Basic.Settings.Output.Mode.Adv="Avanzado"
+Basic.Settings.Output.Mode.FFmpeg="Salida de FFmpeg"
 Basic.Settings.Output.Simple.SavePath="Ruta de grabación FLV"
 Basic.Settings.Output.VideoBitrate="Bitrate de vídeo"
 Basic.Settings.Output.AudioBitrate="Bitrate de audio"
@@ -192,9 +205,32 @@
 Basic.Settings.Output.RetryDelay="Demora al reintentar (segundos)"
 Basic.Settings.Output.MaxRetries="Reintentos máximos"
 Basic.Settings.Output.Advanced="Habilitar la configuración de codificador avanzada"
-Basic.Settings.Output.X264Preset="Perfil x264"
-Basic.Settings.Output.CustomX264Settings="Configuración personalizada x264"
+Basic.Settings.Output.EncoderPreset="Perfil de Codificador (más rapido = menos CPU)"
+Basic.Settings.Output.CustomEncoderSettings="Configuración del codificador personalizada"
 Basic.Settings.Output.UseCBR="Usar Bitrate constante"
+Basic.Settings.Output.UseBufferSize="Usar tamaño de caché personalizado"
+
+Basic.Settings.Output.Adv.Rescale="Cambiar la escala de salida"
+Basic.Settings.Output.Adv.AudioTrack="Pista de audio"
+Basic.Settings.Output.Adv.Streaming="En tiempo real"
+Basic.Settings.Output.Adv.ApplyServiceSettings="Aplicar ajustes de codificador de servicio streaming"
+Basic.Settings.Output.Adv.Audio.Track1="Pista 1"
+Basic.Settings.Output.Adv.Audio.Track2="Pista 2"
+Basic.Settings.Output.Adv.Audio.Track3="Pista 3"
+Basic.Settings.Output.Adv.Audio.Track4="Pista 4"
+
+Basic.Settings.Output.Adv.Recording="Grabando"
+Basic.Settings.Output.Adv.Recording.Type="Tipo"
+Basic.Settings.Output.Adv.Recording.Type.Standard="Estándar"
+Basic.Settings.Output.Adv.Recording.Type.FFmpegOutput="Salida personalizada (FFmpeg)"
+Basic.Settings.Output.Adv.Recording.UseStreamEncoder="(Usar flujo del codificador)"
+Basic.Settings.Output.Adv.FFmpeg.SaveFilter.Common="Formatos comunes de grabación"
+Basic.Settings.Output.Adv.FFmpeg.SaveFilter.All="Todos los Archivos"
+Basic.Settings.Output.Adv.FFmpeg.SavePathURL="Ruta de archivo o URL"
+Basic.Settings.Output.Adv.FFmpeg.VEncoder="Codificador de vídeo (en blanco = default)"
+Basic.Settings.Output.Adv.FFmpeg.VEncoderSettings="Configuración de codificador de vídeo (si existe)"
+Basic.Settings.Output.Adv.FFmpeg.AEncoder="Codificador de audio (en blanco = por defecto)"
+Basic.Settings.Output.Adv.FFmpeg.AEncoderSettings="Configuración de codificador de vídeo (si existe)"
 
 Basic.Settings.Video="Vídeo"
 Basic.Settings.Video.Adapter="Adaptador de vídeo:"
@@ -212,6 +248,10 @@
 Basic.Settings.Video.InvalidResolution="Valor de la resolución no válido.  Debe ser [ancho] x [altura] (por ejemplo, 1920 x 1080)"
 Basic.Settings.Video.CurrentlyActive="La salida de vídeo está actualmente activa.  Por favor apague cualquier salida para cambiar la configuración de vídeo."
 
+Basic.Settings.Video.DownscaleFilter.Bilinear="Bilineal (más rápido, pero borroso si se escala la imagen)"
+Basic.Settings.Video.DownscaleFilter.Bicubic="Bicúbico (Escalado fino, 16 muestras)"
+Basic.Settings.Video.DownscaleFilter.Lanczos="Lanczos (Scalado fino, 32 muestras)"
+
 Basic.Settings.Audio="Audio"
 Basic.Settings.Audio.SampleRate="Frecuencia de muestreo"
 Basic.Settings.Audio.Channels="Canales"
@@ -221,3 +261,19 @@
 Basic.Settings.Audio.AuxDevice2="Dispositivo de audio Mic/auxiliar 2"
 Basic.Settings.Audio.AuxDevice3="Dispositivo de audio Mic/auxiliar 3"
 
+Basic.Settings.Advanced="Avanzado"
+Basic.Settings.Advanced.Audio.BufferingTime="Tiempo de búfer de audio"
+Basic.Settings.Advanced.Video.ColorFormat="Formato de color"
+Basic.Settings.Advanced.Video.ColorSpace="Espacio de color YUV"
+Basic.Settings.Advanced.Video.ColorRange="Gama de Color YUV"
+Basic.Settings.Advanced.Video.ColorRange.Partial="Parcial"
+Basic.Settings.Advanced.Video.ColorRange.Full="Completo"
+
+Basic.AdvAudio="Propiedades de Audio avanzadas"
+Basic.AdvAudio.Name="Nombre"
+Basic.AdvAudio.Volume="Volumen (%)"
+Basic.AdvAudio.Mono="Remezclar a Mono"
+Basic.AdvAudio.Panning="Panorámica"
+Basic.AdvAudio.SyncOffset="Sincronización Offset (ms)"
+Basic.AdvAudio.AudioTracks="Pistas"
+

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/obs/data/locale/eu-ES.ini -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/obs/data/locale/eu-ES.ini Changed

@@ -5,6 +5,8 @@
 OK="Ongi"
 Apply="Ezarri"
 Cancel="Ezeztatu"
+Save="Gorde"
+Discard="Baztertu"
 Yes="Bai"
 No="Ez"
 Add="Gehitu"
@@ -14,6 +16,7 @@
 MoveUp="Mugitu Gora"
 MoveDown="Mugitu Behera"
 Settings="Ezarpenak..."
+Name="Izena"
 Exit="Irten"
 Mixer="Nahastzailea"
 Browse="Bilatu..."
@@ -27,6 +30,9 @@
 NoNameEntered.Title="Mesedez sartu baliozko izen bat"
 NoNameEntered.Text="Ezin duzu izena hutsik erabili."
 
+ConfirmExit.Title="Irten OBS-tik?"
+ConfirmExit.Text="OBS lanean dago une honetan. Zihur zaude irtetzea nahi duzula?"
+
 ConfirmRemove.Title="Baieztatu Kentzea"
 ConfirmRemove.Text="Zihur zaude '$1' kentzea nahi duzula?"
 
@@ -90,6 +96,8 @@
 Basic.PropertiesWindow.AutoSelectFormat="%1 (sostengatu gabea; berez-hautapena: %2)"
 Basic.PropertiesWindow.SelectColor="Hautatu margoa"
 Basic.PropertiesWindow.SelectFont="Hautatu hizkia"
+Basic.PropertiesWindow.ConfirmTitle="Ezarpenak Aldatuta"
+Basic.PropertiesWindow.Confirm="Gorde gabeko aldaketak daude. Heustea nahi diezu?"
 
 Basic.InteractionWindow="Elkarrekintza '%1'-rekin"
 
@@ -163,6 +171,7 @@
 Basic.MainMenu.Edit.Order.MoveDown="Mugitu &Behera"
 Basic.MainMenu.Edit.Order.MoveToTop="Mugitu G&oren"
 Basic.MainMenu.Edit.Order.MoveToBottom="Mugitu B&eheren"
+Basic.MainMenu.Edit.AdvAudio="A&udio Ezaugarri Aurreratuak"
 
 Basic.MainMenu.Help="&Laguntza"
 Basic.MainMenu.Help.Logs="&Ohar Agiriak"
@@ -182,9 +191,13 @@
 Basic.Settings.Stream.StreamType="Jario Mota"
 
 Basic.Settings.Output="Irteera"
+Basic.Settings.Output.Encoder="Kodeatzailea"
+Basic.Settings.Output.SelectDirectory="Hautatu Grabaketa Zuzenbidea"
+Basic.Settings.Output.SelectFile="Hautatu Grabaketa Agiria"
 Basic.Settings.Output.Mode="Irteera Modua"
-Basic.Settings.Output.Mode.Simple="Arrunta (Jarioa eta/edo grabaketa)"
-Basic.Settings.Output.Mode.Advanced="Aurreratua (Norbere irteera mota)"
+Basic.Settings.Output.Mode.Simple="Arrunta"
+Basic.Settings.Output.Mode.Adv="Aurreratua"
+Basic.Settings.Output.Mode.FFmpeg="FFmpeg Irteera"
 Basic.Settings.Output.Simple.SavePath="FLV Grabaketa Helburua"
 Basic.Settings.Output.VideoBitrate="Bideo Bitneurria"
 Basic.Settings.Output.AudioBitrate="Audio Bitneurria"
@@ -192,9 +205,32 @@
 Basic.Settings.Output.RetryDelay="Saiakera Atzerapena (segundu)"
 Basic.Settings.Output.MaxRetries="Gehienezko Saiakerak"
 Basic.Settings.Output.Advanced="Gaitu Kodeatzaile Aurreratu Ezarpenak"
-Basic.Settings.Output.X264Preset="x264 Aurrezarpena"
-Basic.Settings.Output.CustomX264Settings="Norbere x264 Ezarpenak"
+Basic.Settings.Output.EncoderPreset="Kodeatzaile Aurrezarpena (handiagoa = CPU gutxiago)"
+Basic.Settings.Output.CustomEncoderSettings="Norbere Kodeatzaile Ezarpenak"
 Basic.Settings.Output.UseCBR="Erabili Bitneurri Aldagaitza"
+Basic.Settings.Output.UseBufferSize="Erabili Norbere Buffer Neurria"
+
+Basic.Settings.Output.Adv.Rescale="Birneurriratu Irteera"
+Basic.Settings.Output.Adv.AudioTrack="Audio Bidea"
+Basic.Settings.Output.Adv.Streaming="Jarioa"
+Basic.Settings.Output.Adv.ApplyServiceSettings="Behartu jario zerbitzu kodeatzaile ezarpenak"
+Basic.Settings.Output.Adv.Audio.Track1="1 Bidea"
+Basic.Settings.Output.Adv.Audio.Track2="2 Bidea"
+Basic.Settings.Output.Adv.Audio.Track3="3 Bidea"
+Basic.Settings.Output.Adv.Audio.Track4="4 Bidea"
+
+Basic.Settings.Output.Adv.Recording="Grabatzen"
+Basic.Settings.Output.Adv.Recording.Type="Mota"
+Basic.Settings.Output.Adv.Recording.Type.Standard="Estandarra"
+Basic.Settings.Output.Adv.Recording.Type.FFmpegOutput="Norbere Irteera (FFmpeg)"
+Basic.Settings.Output.Adv.Recording.UseStreamEncoder="(Erabili jario kodeatzailea)"
+Basic.Settings.Output.Adv.FFmpeg.SaveFilter.Common="Grabaketa heuskarri arruntak"
+Basic.Settings.Output.Adv.FFmpeg.SaveFilter.All="Agiri Guztiak"
+Basic.Settings.Output.Adv.FFmpeg.SavePathURL="Agiri helburua edo URL-a"
+Basic.Settings.Output.Adv.FFmpeg.VEncoder="Bideo Kodeatzailea (hutsik=berezkoa)"
+Basic.Settings.Output.Adv.FFmpeg.VEncoderSettings="Bideo Kodeatzaile Ezarpenak (egonez gero)"
+Basic.Settings.Output.Adv.FFmpeg.AEncoder="Audio Kodeatzailea (hutsik=berezkoa)"
+Basic.Settings.Output.Adv.FFmpeg.AEncoderSettings="Audio Kodeatzaile Ezarpenak (egonez gero)"
 
 Basic.Settings.Video="Bideoa"
 Basic.Settings.Video.Adapter="Bideo Egokitzailea:"
@@ -212,6 +248,10 @@
 Basic.Settings.Video.InvalidResolution="Bereizmen balio baliogabea. Izan behar da [width]x[height] (adib. 1920x1080)"
 Basic.Settings.Video.CurrentlyActive="Bideo irtera gaituta dago une honetan. Mesedez eten irteera guztiak bideo ezarpenak aldatzeko."
 
+Basic.Settings.Video.DownscaleFilter.Bilinear="Bilinearra (Azkarrena, baina lausoa eskalatuz gero)"
+Basic.Settings.Video.DownscaleFilter.Bicubic="Bikubikoa (Eskalatze itzaldua, 16 lagin)"
+Basic.Settings.Video.DownscaleFilter.Lanczos="Lanczos (Eskalatze itzaldua, 32 lagin)"
+
 Basic.Settings.Audio="Audioa"
 Basic.Settings.Audio.SampleRate="Laginketa Neurria"
 Basic.Settings.Audio.Channels="Bideak"
@@ -221,3 +261,12 @@
 Basic.Settings.Audio.AuxDevice2="Mik/Osagarri Audio Gailua 2"
 Basic.Settings.Audio.AuxDevice3="Mik/Osagarri Audio Gailua 3"
 
+
+Basic.AdvAudio="Audio Ezaugarri Aurreratuak"
+Basic.AdvAudio.Name="Izena"
+Basic.AdvAudio.Volume="Bolumena (%)"
+Basic.AdvAudio.Mono="Behera-nahastu Monora"
+Basic.AdvAudio.Panning="Panoramika"
+Basic.AdvAudio.SyncOffset="Aldiberetze Oreka (sm)"
+Basic.AdvAudio.AudioTracks="Bideak"
+

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/obs/data/locale/fi-FI.ini -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/obs/data/locale/fi-FI.ini Changed

@@ -5,6 +5,8 @@
 OK="OK"
 Apply="Käytä"
 Cancel="Peruuta"
+Save="Tallenna"
+Discard="Hylkää"
 Yes="Kyllä"
 No="Ei"
 Add="Lisää"
@@ -14,6 +16,7 @@
 MoveUp="Siirrä ylös"
 MoveDown="Siirrä alas"
 Settings="Asetukset"
+Name="Nimi"
 Exit="Poistu"
 Mixer="Mikseri"
 Browse="Selaa"
@@ -27,6 +30,9 @@
 NoNameEntered.Title="Syötä sopiva nimi"
 NoNameEntered.Text="Et voi käyttää tyhjiä nimiä."
 
+ConfirmExit.Title="Sulje OBS?"
+ConfirmExit.Text="OBS on käytössä. Haluatko varmasti sulkea sen?"
+
 ConfirmRemove.Title="Vahvista poisto"
 ConfirmRemove.Text="Haluatko varmasti poistaa '$1'?"
 
@@ -91,6 +97,8 @@
 Basic.PropertiesWindow.AutoSelectFormat="%1 (ei tueta; automaattinen: %2)"
 Basic.PropertiesWindow.SelectColor="Valitse väri"
 Basic.PropertiesWindow.SelectFont="Valitse kirjasin"
+Basic.PropertiesWindow.ConfirmTitle="Asetukset ovat muuttuneet"
+Basic.PropertiesWindow.Confirm="Muutoksia ei ole vielä tallennettu. Haluatko pitää muutokset?"
 
 Basic.InteractionWindow="Vuorovaikutetaan '%1' kanssa"
 
@@ -164,6 +172,7 @@
 Basic.MainMenu.Edit.Order.MoveDown="Siirrä &alas"
 Basic.MainMenu.Edit.Order.MoveToTop="Siirrä &ylimmäksi"
 Basic.MainMenu.Edit.Order.MoveToBottom="Siirrä &alimmaksi"
+Basic.MainMenu.Edit.AdvAudio="&Äänen lisäominaisuudet"
 
 Basic.MainMenu.Help="&Apua"
 Basic.MainMenu.Help.Logs="&Lokitiedostot"
@@ -183,9 +192,13 @@
 Basic.Settings.Stream.StreamType="Lähetystyyppi"
 
 Basic.Settings.Output="Ulostulo"
+Basic.Settings.Output.Encoder="Enkooderi"
+Basic.Settings.Output.SelectDirectory="Valitse tallennuskansio"
+Basic.Settings.Output.SelectFile="Valitse tallennustiedosto"
 Basic.Settings.Output.Mode="Ulostulon tila"
-Basic.Settings.Output.Mode.Simple="Yksinkertainen (Lähetys ja/tai tallennus)"
-Basic.Settings.Output.Mode.Advanced="Monipuolinen (Custom output type)"
+Basic.Settings.Output.Mode.Simple="Yksinkertainen"
+Basic.Settings.Output.Mode.Adv="Kehittynyt"
+Basic.Settings.Output.Mode.FFmpeg="FFmpeg ulostulo"
 Basic.Settings.Output.Simple.SavePath="FLV-tallennuksen polku"
 Basic.Settings.Output.VideoBitrate="Kuvan bitrate"
 Basic.Settings.Output.AudioBitrate="Äänen bitrate"
@@ -193,9 +206,32 @@
 Basic.Settings.Output.RetryDelay="Uudelleenyrityksen viive (sekunteja)"
 Basic.Settings.Output.MaxRetries="Uudelleenyhdistyksien määrä"
 Basic.Settings.Output.Advanced="Käytä enkooderin lisäasetuksia"
-Basic.Settings.Output.X264Preset="x264-esiasetus"
-Basic.Settings.Output.CustomX264Settings="Mukautetut x264-asetukset"
+Basic.Settings.Output.EncoderPreset="Enkooderin asetus (korkeampi lisää tehon kulutusta)"
+Basic.Settings.Output.CustomEncoderSettings="Valinnaiset enkooderiasetukset"
 Basic.Settings.Output.UseCBR="Pidä bitrate vakiona"
+Basic.Settings.Output.UseBufferSize="Käytä valinnaista puskurin kokoa"
+
+Basic.Settings.Output.Adv.Rescale="Uudelleenskaalaa ulostulo"
+Basic.Settings.Output.Adv.AudioTrack="Ääniraita"
+Basic.Settings.Output.Adv.Streaming="Lähetys"
+Basic.Settings.Output.Adv.ApplyServiceSettings="Pakota asetukset palvelun suosituksiin"
+Basic.Settings.Output.Adv.Audio.Track1="Raita 1"
+Basic.Settings.Output.Adv.Audio.Track2="Raita 2"
+Basic.Settings.Output.Adv.Audio.Track3="Raita 3"
+Basic.Settings.Output.Adv.Audio.Track4="Raita 4"
+
+Basic.Settings.Output.Adv.Recording="Tallennus"
+Basic.Settings.Output.Adv.Recording.Type="Tyyppi"
+Basic.Settings.Output.Adv.Recording.Type.Standard="Tavallinen"
+Basic.Settings.Output.Adv.Recording.Type.FFmpegOutput="Valinnainen lähtö (FFmpeg)"
+Basic.Settings.Output.Adv.Recording.UseStreamEncoder="(Käytä lähetysenkooderia)"
+Basic.Settings.Output.Adv.FFmpeg.SaveFilter.Common="Yleiset tallennusmuodot"
+Basic.Settings.Output.Adv.FFmpeg.SaveFilter.All="Kaikki tiedostot"
+Basic.Settings.Output.Adv.FFmpeg.SavePathURL="Tiedostopolku tai URL-osoite"
+Basic.Settings.Output.Adv.FFmpeg.VEncoder="Video-enkooderi (tyhjä = oletus)"
+Basic.Settings.Output.Adv.FFmpeg.VEncoderSettings="Video-enkooderin asetukset"
+Basic.Settings.Output.Adv.FFmpeg.AEncoder="Ääni-enkooderi (tyhjä = oletus)"
+Basic.Settings.Output.Adv.FFmpeg.AEncoderSettings="Ääni-enkooderin asetukset"
 
 Basic.Settings.Video="Kuva"
 Basic.Settings.Video.Adapter="Näytönohjain:"
@@ -213,6 +249,10 @@
 Basic.Settings.Video.InvalidResolution="Vialliset resoluution asetus.  Muodon pitää olla [leveys]x[korkeus] (esim. 1920x1080)"
 Basic.Settings.Video.CurrentlyActive="Kuvan ulostulo on tällä hetkellä käytössä.  Kytke pois kaikki ulostulot vaihtaaksesi kuva-asetuksia."
 
+Basic.Settings.Video.DownscaleFilter.Bilinear="Bilinear (nopein, sumeutuu skaalattaessa)"
+Basic.Settings.Video.DownscaleFilter.Bicubic="Bicubic (Terävöity skaalaus, 16 näytettä)"
+Basic.Settings.Video.DownscaleFilter.Lanczos="Lanczos (Terävöity skaalaus, 32 näytettä)"
+
 Basic.Settings.Audio="Ääni"
 Basic.Settings.Audio.SampleRate="Näytteenottotaajuus"
 Basic.Settings.Audio.Channels="Kanavat"
@@ -222,3 +262,12 @@
 Basic.Settings.Audio.AuxDevice2="Mic/Aux -äänilaite 2"
 Basic.Settings.Audio.AuxDevice3="Mic/Aux -äänilaite 3"
 
+
+Basic.AdvAudio="Äänen lisäominaisuudet"
+Basic.AdvAudio.Name="Nimi"
+Basic.AdvAudio.Volume="Äänenvoimakkuus (%)"
+Basic.AdvAudio.Mono="Miksaa yksikanavaiseksi"
+Basic.AdvAudio.Panning="Vieritys"
+Basic.AdvAudio.SyncOffset="Sync Offset (ms)"
+Basic.AdvAudio.AudioTracks="Raidat"
+

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/obs/data/locale/fr-FR.ini -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/obs/data/locale/fr-FR.ini Changed

@@ -1,10 +1,12 @@
 
-Language="français"
+Language="Français"
 Region="France"
 
 OK="Ok"
 Apply="Appliquer"
 Cancel="Annuler"
+Save="Enregistrer"
+Discard="Ignorer les modifications"
 Yes="Oui"
 No="Non"
 Add="Ajouter"
@@ -14,12 +16,13 @@
 MoveUp="Déplacer vers le haut"
 MoveDown="Déplacer vers le bas"
 Settings="Paramètres"
+Name="Nom"
 Exit="Quitter OBS"
 Mixer="Table de mixage"
 Browse="Parcourir"
 Mono="Mono"
 Stereo="Stéréo"
-DroppedFrames="Images Perdus %1 (%2%)"
+DroppedFrames="Images Perdues %1 (%2%)"
 
 NameExists.Title="Ce nom existe déjà"
 NameExists.Text="Ce nom est déjà utilisé."
@@ -27,10 +30,13 @@
 NoNameEntered.Title="Veuillez saisir un nom valide"
 NoNameEntered.Text="Vous ne pouvez pas utiliser de noms vides."
 
+ConfirmExit.Title="Quitter OBS ?"
+ConfirmExit.Text="OBS est toujours actif. Êtes-vous certain de vouloir quitter ?"
+
 ConfirmRemove.Title="Confirmer la suppression"
 ConfirmRemove.Text="Êtes-vous sûr de vouloir supprimer « $1 » ?"
 
-Output.ConnectFail.Title="Echec de la connexion"
+Output.ConnectFail.Title="Échec de la connexion"
 Output.ConnectFail.BadPath="Adresse de Connexion ou Chemin Invalide. Veuillez vérifier vos paramètres afin de confirmer leur validité."
 Output.ConnectFail.ConnectFailed="Échec de Connexion au Serveur"
 Output.ConnectFail.InvalidStream="Impossible d'accéder à la chaîne ou à la clé spécifiée. Cela peut être causé par une chaîne/clé invalide ou par le serveur qui vous considère toujours connecté."
@@ -52,17 +58,17 @@
 
 Remux.SourceFile="Enregistrement OBS"
 Remux.TargetFile="Fichier cible"
-Remux.Remux="Réencapsuler"
+Remux.Remux="Convertir"
 Remux.RecordingPattern="Enregistrement OBS (*.flv)"
-Remux.FinishedTitle="Réencapsulage terminé"
-Remux.Finished="L'enregistrement est réencapsulé"
-Remux.FinishedError="L'enregistrement est réencapsulé, mais le fichier peut être incomplet"
+Remux.FinishedTitle="Conversion terminée"
+Remux.Finished="L'enregistrement a été converti"
+Remux.FinishedError="L'enregistrement a été converti, mais le fichier peut être incomplet"
 Remux.SelectRecording="Choisir un enregistrement OBS …"
 Remux.SelectTarget="Choisir le fichier cible …"
 Remux.FileExistsTitle="Fichier cible existant"
 Remux.FileExists="Le fichier cible existe, voulez-vous le remplacer ?"
-Remux.ExitUnfinishedTitle="Réencapsulage en cours"
-Remux.ExitUnfinished="Le réencapsulage n'est pas terminé, arrêter maintenant peut rendre le fichier cible inutilisable.\nVoulez-vous vraiment arrêter le réencapsulage ?"
+Remux.ExitUnfinishedTitle="Conversion en cours"
+Remux.ExitUnfinished="La conversion n'est pas terminée, arrêter maintenant peut rendre le fichier cible inutilisable.\nVoulez-vous vraiment arrêter la conversion ?"
 
 UpdateAvailable="Nouvelle Mise à Jour Disponible"
 UpdateAvailable.Text="La version %1.%2.%3 est désormais disponible. <a href='%4'>Cliquez ici pour la télécharger</a>"
@@ -90,6 +96,8 @@
 Basic.PropertiesWindow.AutoSelectFormat="%1 (non supporté ; sélection automatique: %2)"
 Basic.PropertiesWindow.SelectColor="Sélectionnez une couleur"
 Basic.PropertiesWindow.SelectFont="Sélectionnez la police"
+Basic.PropertiesWindow.ConfirmTitle="Paramètres modifiés"
+Basic.PropertiesWindow.Confirm="Des modifications n'ont pas été enregistrées. Voulez-vous les conserver ?"
 
 Basic.InteractionWindow="Interagit avec '%1'"
 
@@ -116,102 +124,134 @@
 Basic.TransformWindow.Alignment.BottomRight="En Bas à Droite"
 
 Basic.TransformWindow.BoundsType.None="Sans Contours"
-Basic.TransformWindow.BoundsType.MaxOnly="Taille Maximale Uniquement"
-Basic.TransformWindow.BoundsType.ScaleInner="Mettre à l'échelle par les Dimensions Intérieurs"
-Basic.TransformWindow.BoundsType.ScaleOuter="Mettre à l'échelle par les Dimensions Extérieurs"
-Basic.TransformWindow.BoundsType.ScaleToWidth="Mettre à l'échelle par la Largeur"
-Basic.TransformWindow.BoundsType.ScaleToHeight="Mettre à l'échelle par la Hauteur"
-Basic.TransformWindow.BoundsType.Stretch="Étiré au Dimensions"
-
-Basic.Main.AddSourceHelp.Title="Impossible d'ajouter la Source"
+Basic.TransformWindow.BoundsType.MaxOnly="Taille maximale uniquement"
+Basic.TransformWindow.BoundsType.ScaleInner="Mettre à l'échelle par les dimensions intérieurs"
+Basic.TransformWindow.BoundsType.ScaleOuter="Mettre à l'échelle par les dimensions extérieurs"
+Basic.TransformWindow.BoundsType.ScaleToWidth="Mettre à l'échelle par la largeur"
+Basic.TransformWindow.BoundsType.ScaleToHeight="Mettre à l'échelle par la hauteur"
+Basic.TransformWindow.BoundsType.Stretch="Étirer aux dimensions"
+
+Basic.Main.AddSourceHelp.Title="Impossible d'ajouter la source"
 Basic.Main.AddSourceHelp.Text="Vous devez avoir au moins 1 scène pour ajouter une source."
 
 Basic.Main.Scenes="Scènes"
 Basic.Main.Sources="Sources"
 Basic.Main.Connecting="Connexion en cours..."
 Basic.Main.StartRecording="Démarrer l'enregistrement"
-Basic.Main.StartStreaming="Commencer le Streaming"
+Basic.Main.StartStreaming="Commencer le streaming"
 Basic.Main.StopRecording="Arrêter l'enregistrement"
-Basic.Main.StopStreaming="Arrêter le Streaming"
+Basic.Main.StopStreaming="Arrêter le streaming"
 
 Basic.MainMenu.File="&Fichier"
 Basic.MainMenu.File.Export="&Exporter"
 Basic.MainMenu.File.Import="&Importer"
 Basic.MainMenu.File.ShowRecordings="Affichage & enregistrements"
-Basic.MainMenu.File.Remux="Réencapsuler un enregistrement"
+Basic.MainMenu.File.Remux="&Convertir un enregistrement"
 Basic.MainMenu.File.Settings="&Paramètres"
 Basic.MainMenu.File.Exit="&Quitter"
 
-Basic.MainMenu.Edit="E&diter"
+Basic.MainMenu.Edit="&Editer"
 Basic.MainMenu.Edit.Undo="&Annuler"
 Basic.MainMenu.Edit.Redo="&Rétablir"
-Basic.MainMenu.Edit.UndoAction="A&nnuler $1"
-Basic.MainMenu.Edit.RedoAction="Réta&blir $1"
+Basic.MainMenu.Edit.UndoAction="&Annuler $1"
+Basic.MainMenu.Edit.RedoAction="&Rétablir $1"
 Basic.MainMenu.Edit.Transform="&Transformer"
-Basic.MainMenu.Edit.Transform.EditTransform="Éditer la Transformation..."
-Basic.MainMenu.Edit.Transform.ResetTransform="Réinitialiser la Transformation"
-Basic.MainMenu.Edit.Transform.Rotate90CW="Rotation 90° Horaire"
-Basic.MainMenu.Edit.Transform.Rotate90CCW="Rotation 90° Anti-horaire"
+Basic.MainMenu.Edit.Transform.EditTransform="Éditer la transformation..."
+Basic.MainMenu.Edit.Transform.ResetTransform="Réinitialiser la transformation"
+Basic.MainMenu.Edit.Transform.Rotate90CW="Rotation de 90° sens horaire"
+Basic.MainMenu.Edit.Transform.Rotate90CCW="Rotation de 90° sens antihoraire"
 Basic.MainMenu.Edit.Transform.Rotate180="Rotation de 180°"
-Basic.MainMenu.Edit.Transform.FlipHorizontal="Inverser &Horizontalement"
-Basic.MainMenu.Edit.Transform.FlipVertical="Inverser &Verticalement"
+Basic.MainMenu.Edit.Transform.FlipHorizontal="Inverser &horizontalement"
+Basic.MainMenu.Edit.Transform.FlipVertical="Inverser &verticalement"
 Basic.MainMenu.Edit.Transform.FitToScreen="&Adapter à l'écran"
 Basic.MainMenu.Edit.Transform.StretchToScreen="&Etirer à l'écran"
 Basic.MainMenu.Edit.Transform.CenterToScreen="&Centrer à l'écran"
 Basic.MainMenu.Edit.Order="&Ordonner"
 Basic.MainMenu.Edit.Order.MoveUp="&Monter d'un cran"
 Basic.MainMenu.Edit.Order.MoveDown="&Descendre d'un cran"
-Basic.MainMenu.Edit.Order.MoveToTop="Déplacer en tout en &Haut"
-Basic.MainMenu.Edit.Order.MoveToBottom="Déplacer tout en &Bas"
+Basic.MainMenu.Edit.Order.MoveToTop="Déplacer tout en &haut"
+Basic.MainMenu.Edit.Order.MoveToBottom="Déplacer tout en &bas"
+Basic.MainMenu.Edit.AdvAudio="Propriétés audio &avancées"
 
 Basic.MainMenu.Help="&Aide"
 Basic.MainMenu.Help.Logs="&Fichiers journaux"
-Basic.MainMenu.Help.Logs.ShowLogs="& Afficher les fichiers de Log"
-Basic.MainMenu.Help.Logs.UploadCurrentLog="Mettre en Ligne le Fichier Journal &Actuel"
-Basic.MainMenu.Help.Logs.UploadLastLog="Mettre en Ligne le &Dernier Fichier Journal"
-Basic.MainMenu.Help.CheckForUpdates="Rechercher des Mises à Jour"
+Basic.MainMenu.Help.Logs.ShowLogs="Afficher les &fichiers de log"
+Basic.MainMenu.Help.Logs.UploadCurrentLog="Mettre en ligne le fichier journal &actuel"
+Basic.MainMenu.Help.Logs.UploadLastLog="Mettre en ligne le &dernier fichier journal"
+Basic.MainMenu.Help.CheckForUpdates="Rechercher des mises à jour"
 
-Basic.Settings.ProgramRestart="Le programme doit être redémarré pour que ces paramètres prennent effet."
+Basic.Settings.ProgramRestart="Le programme doit être redémarré pour que les paramètres prennent effet."
 Basic.Settings.ConfirmTitle="Valider les modifications"
-Basic.Settings.Confirm="Vous avez des modifications non enregistrées.  Voulez-vous les enregistrer ?"
+Basic.Settings.Confirm="Vous avez des modifications non enregistrées. Voulez-vous les enregistrer ?"
 
 Basic.Settings.General="Général"
-Basic.Settings.General.Language="Langue:"
+Basic.Settings.General.Language="Langue :"
 
 Basic.Settings.Stream="Diffuser"
-Basic.Settings.Stream.StreamType="Type de Diffusion"
+Basic.Settings.Stream.StreamType="Type de diffusion"
 
 Basic.Settings.Output="Sortie"
-Basic.Settings.Output.Mode="Mode de Sortie"
-Basic.Settings.Output.Mode.Simple="Simple (Diffusion et/ou Enregistrement)"
-Basic.Settings.Output.Mode.Advanced="Avancés (type de sortie personnalisée)"
-Basic.Settings.Output.Simple.SavePath="Chemin d'Enregistrement FLV"
-Basic.Settings.Output.VideoBitrate="Débit Vidéo"
+Basic.Settings.Output.Encoder="Encodeur"
+Basic.Settings.Output.SelectDirectory="Sélectionnez le répertoire d'enregistrement"
+Basic.Settings.Output.SelectFile="Sélectionnez le fichier cible"
+Basic.Settings.Output.Mode="Mode de sortie"
+Basic.Settings.Output.Mode.Simple="Simple"
+Basic.Settings.Output.Mode.Adv="Avancé"
+Basic.Settings.Output.Mode.FFmpeg="Sortie FFmpeg"
+Basic.Settings.Output.Simple.SavePath="Chemin de l'enregistrement FLV"
+Basic.Settings.Output.VideoBitrate="Débit vidéo"
 Basic.Settings.Output.AudioBitrate="Débit audio"
 Basic.Settings.Output.Reconnect="Reconnecter Automatiquement"
-Basic.Settings.Output.RetryDelay="Délais avant Tentative de Reconnexion (secondes)"
-Basic.Settings.Output.MaxRetries="Nombres de Tentatives Maximum"
+Basic.Settings.Output.RetryDelay="Délai avant la tentative de reconnexion (en secondes)"
+Basic.Settings.Output.MaxRetries="Nombres de tentatives maximales"
 Basic.Settings.Output.Advanced="Activer les paramètres avancés d'encodage"
-Basic.Settings.Output.X264Preset="Préréglages x264"

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/obs/data/locale/gl-ES.ini -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/obs/data/locale/gl-ES.ini Changed

@@ -5,6 +5,8 @@
 OK="Aceptar"
 Apply="Aplicar"
 Cancel="Cancelar"
+Save="Gardar"
+Discard="Descartar"
 Yes="Si"
 No="Non"
 Add="Engadir"
@@ -14,6 +16,7 @@
 MoveUp="Subir"
 MoveDown="Baixar"
 Settings="Axustes"
+Name="Nome"
 Exit="Saír"
 Mixer="Mesturador"
 Browse="Explorar"
@@ -27,6 +30,9 @@
 NoNameEntered.Title="Por favor, insire un nome válido"
 NoNameEntered.Text="Non podes empregar nomes baleiros."
 
+ConfirmExit.Title="Saír de OBS?"
+ConfirmExit.Text="OBS está activo neste momento. Tes a certeza de que desexas saír?"
+
 ConfirmRemove.Title="Confirmar a eliminación"
 ConfirmRemove.Text="Tes a certeza de querer eliminar '$1'?"
 
@@ -90,6 +96,8 @@
 Basic.PropertiesWindow.AutoSelectFormat="%1 (non compatible; autoseleccionar: %2)"
 Basic.PropertiesWindow.SelectColor="Seleccionar cor"
 Basic.PropertiesWindow.SelectFont="Seleccionar fonte"
+Basic.PropertiesWindow.ConfirmTitle="Axustes cambiados"
+Basic.PropertiesWindow.Confirm="Hai cambios sen gardar. Queres conservalos?"
 
 Basic.InteractionWindow="Interactuando con '%1'"
 
@@ -163,6 +171,7 @@
 Basic.MainMenu.Edit.Order.MoveDown="Baixar"
 Basic.MainMenu.Edit.Order.MoveToTop="Levar para a cima"
 Basic.MainMenu.Edit.Order.MoveToBottom="Levar para abaixo"
+Basic.MainMenu.Edit.AdvAudio="Propiedades de audio &avanzadas"
 
 Basic.MainMenu.Help="&Axuda"
 Basic.MainMenu.Help.Logs="&Ficheiros de rexistro"
@@ -182,9 +191,13 @@
 Basic.Settings.Stream.StreamType="Tipo de retransmisión"
 
 Basic.Settings.Output="Saída"
+Basic.Settings.Output.Encoder="Codificador"
+Basic.Settings.Output.SelectDirectory="Seleccionar directorio de gravación"
+Basic.Settings.Output.SelectFile="Seleccionar ficheiro de gravación"
 Basic.Settings.Output.Mode="Modo de saída"
-Basic.Settings.Output.Mode.Simple="Simple (retransmisión e/ou gravación)"
-Basic.Settings.Output.Mode.Advanced="Avanzado (saída personalizada)"
+Basic.Settings.Output.Mode.Simple="Sinxelo"
+Basic.Settings.Output.Mode.Adv="Avanzado"
+Basic.Settings.Output.Mode.FFmpeg="Saída de FFmpeg"
 Basic.Settings.Output.Simple.SavePath="Camiño de gravación FLV"
 Basic.Settings.Output.VideoBitrate="Velocidade de bits de vídeo"
 Basic.Settings.Output.AudioBitrate="Velocidade de bits de audio"
@@ -192,9 +205,29 @@
 Basic.Settings.Output.RetryDelay="Retardo da nova tentativa (segundos)"
 Basic.Settings.Output.MaxRetries="Número máximo de tentativas"
 Basic.Settings.Output.Advanced="Activar a configuración do codificador avanzada"
-Basic.Settings.Output.X264Preset="Predefinido x264"
-Basic.Settings.Output.CustomX264Settings="Configuración personalizada x264"
+Basic.Settings.Output.CustomEncoderSettings="Axustes do codificador personalizados"
 Basic.Settings.Output.UseCBR="Utilizar unha velocidade de bits constante"
+Basic.Settings.Output.UseBufferSize="Utilizar tamaño do búfer personalizado"
+
+Basic.Settings.Output.Adv.Rescale="Cambiar a escala de saída"
+Basic.Settings.Output.Adv.AudioTrack="Pista de audio"
+Basic.Settings.Output.Adv.Streaming="En tempo real"
+Basic.Settings.Output.Adv.Audio.Track1="Pista 1"
+Basic.Settings.Output.Adv.Audio.Track2="Pista 2"
+Basic.Settings.Output.Adv.Audio.Track3="Pista 3"
+Basic.Settings.Output.Adv.Audio.Track4="Pista 4"
+
+Basic.Settings.Output.Adv.Recording="Gravando"
+Basic.Settings.Output.Adv.Recording.Type="Tipo"
+Basic.Settings.Output.Adv.Recording.Type.Standard="Estándar"
+Basic.Settings.Output.Adv.Recording.Type.FFmpegOutput="Saída personalizada (FFmpeg)"
+Basic.Settings.Output.Adv.FFmpeg.SaveFilter.Common="Formatos comúns de gravación"
+Basic.Settings.Output.Adv.FFmpeg.SaveFilter.All="Todos os ficheiros"
+Basic.Settings.Output.Adv.FFmpeg.SavePathURL="Camiño do ficheiro ou URL"
+Basic.Settings.Output.Adv.FFmpeg.VEncoder="Codificador de vídeo (en branco = por defecto)"
+Basic.Settings.Output.Adv.FFmpeg.VEncoderSettings="Axustes do codificador de vídeo (se existe)"
+Basic.Settings.Output.Adv.FFmpeg.AEncoder="Codificador de audio (en branco = por defecto)"
+Basic.Settings.Output.Adv.FFmpeg.AEncoderSettings="Axustes do codificador de audio (se existe)"
 
 Basic.Settings.Video="Vídeo"
 Basic.Settings.Video.Adapter="Adaptador de vídeo:"
@@ -212,6 +245,10 @@
 Basic.Settings.Video.InvalidResolution="Valor da resolución non válido.  Debe ser [width] x [height] (por exemplo, 1920 x 1080)"
 Basic.Settings.Video.CurrentlyActive="A saída de vídeo está actualmente activa.  Por favor, apaga calquera saída para cambiar a configuración de vídeo."
 
+Basic.Settings.Video.DownscaleFilter.Bilinear="Bilinear (máis rápido, pero borroso de se escalar a imaxe)"
+Basic.Settings.Video.DownscaleFilter.Bicubic="Bicúbico (escalamento fino, 16 mostras)"
+Basic.Settings.Video.DownscaleFilter.Lanczos="Lanczos (escalamento fino, 32 mostras)"
+
 Basic.Settings.Audio="Audio"
 Basic.Settings.Audio.SampleRate="Intervalo da mostra"
 Basic.Settings.Audio.Channels="Canles"
@@ -221,3 +258,18 @@
 Basic.Settings.Audio.AuxDevice2="Dispositivo de audio mic./auxiliar 2"
 Basic.Settings.Audio.AuxDevice3="Dispositivo de audio mic./auxiliar 3"
 
+Basic.Settings.Advanced="Avanzado"
+Basic.Settings.Advanced.Audio.BufferingTime="Tempo do búfer de audio"
+Basic.Settings.Advanced.Video.ColorFormat="Formato da cor"
+Basic.Settings.Advanced.Video.ColorSpace="Espazo de cor YUV"
+Basic.Settings.Advanced.Video.ColorRange="Gama de cor YUV"
+Basic.Settings.Advanced.Video.ColorRange.Partial="Parcial"
+
+Basic.AdvAudio="Propiedades de audio avanzadas"
+Basic.AdvAudio.Name="Nome"
+Basic.AdvAudio.Volume="Volume (%)"
+Basic.AdvAudio.Mono="Remesturar a mono"
+Basic.AdvAudio.Panning="Panorámica"
+Basic.AdvAudio.SyncOffset="Sincronización Offset (ms)"
+Basic.AdvAudio.AudioTracks="Pistas"
+

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/obs/data/locale/hr-HR.ini -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/obs/data/locale/hr-HR.ini Changed

@@ -14,6 +14,7 @@
 MoveUp="Pomeri gore"
 MoveDown="Pomeri dole"
 Settings="Podešavanja"
+Name="Ime"
 Exit="Izlaz"
 Mixer="Mikseta"
 Browse="Pretraži"
@@ -27,6 +28,9 @@
 NoNameEntered.Title="Molim unesite ispravno ime"
 NoNameEntered.Text="Ne možete izostaviti ime."
 
+ConfirmExit.Title="Napustiti OBS?"
+ConfirmExit.Text="OBS je trenutno aktivan. Da li ste sigurni da želite izaći?"
+
 ConfirmRemove.Title="Potvrdi izbacivanje"
 ConfirmRemove.Text="Da li ste sigurni da želite izbaciti '$1'?"
 
@@ -90,6 +94,8 @@
 Basic.PropertiesWindow.AutoSelectFormat="%1 (nije podržano; automatski odabrano: %2)"
 Basic.PropertiesWindow.SelectColor="Izaberi boju"
 Basic.PropertiesWindow.SelectFont="Izaberi font"
+Basic.PropertiesWindow.ConfirmTitle="Podešavanja promenjena"
+Basic.PropertiesWindow.Confirm="Postoje podešavanja koja nisu sačuvana. Da li želite da ih sačuvate?"
 
 Basic.InteractionWindow="Interakcija sa '%1'"
 
@@ -163,6 +169,7 @@
 Basic.MainMenu.Edit.Order.MoveDown="Pomeri &dole"
 Basic.MainMenu.Edit.Order.MoveToTop="Pomeri na vrh (&T)"
 Basic.MainMenu.Edit.Order.MoveToBottom="Pomeri na dno (&B)"
+Basic.MainMenu.Edit.AdvAudio="N&apredna podešavanja zvuka"
 
 Basic.MainMenu.Help="Pomoć (&H)"
 Basic.MainMenu.Help.Logs="&Log datoteke"
@@ -182,9 +189,13 @@
 Basic.Settings.Stream.StreamType="Vrsta strima"
 
 Basic.Settings.Output="Izlaz"
+Basic.Settings.Output.Encoder="Enkoder"
+Basic.Settings.Output.SelectDirectory="Odaberi direktorijum za snimanje"
+Basic.Settings.Output.SelectFile="Odaberi datoteku za snimanje"
 Basic.Settings.Output.Mode="Režim izlaza"
-Basic.Settings.Output.Mode.Simple="Jednostavno (stream i/ili snimanje)"
-Basic.Settings.Output.Mode.Advanced="Napredno (specifičan tip izlaza)"
+Basic.Settings.Output.Mode.Simple="Jednostavno"
+Basic.Settings.Output.Mode.Adv="Napredno"
+Basic.Settings.Output.Mode.FFmpeg="FFmpeg izlaz"
 Basic.Settings.Output.Simple.SavePath="Putanja snimka za FLV"
 Basic.Settings.Output.VideoBitrate="Protok videa"
 Basic.Settings.Output.AudioBitrate="Protok zvuka"
@@ -192,9 +203,31 @@
 Basic.Settings.Output.RetryDelay="Pauza pre ponovnog pokušaja (sekunde)"
 Basic.Settings.Output.MaxRetries="Maksimalan broj ponovnih pokušaja"
 Basic.Settings.Output.Advanced="Omogući napredna podešavanja kompresora"
-Basic.Settings.Output.X264Preset="x264 šablon"
-Basic.Settings.Output.CustomX264Settings="Specifična x264 podešavanja"
+Basic.Settings.Output.EncoderPreset="Šablon enkodera (veće = manje CPU)"
+Basic.Settings.Output.CustomEncoderSettings="Prilagođena enkoder podešavanja"
 Basic.Settings.Output.UseCBR="Koristi konstantan protok"
+Basic.Settings.Output.UseBufferSize="Koristi specifičnu veličinu bafera"
+
+Basic.Settings.Output.Adv.Rescale="Skaliraj izlaz"
+Basic.Settings.Output.Adv.AudioTrack="Zvučni izvor"
+Basic.Settings.Output.Adv.Streaming="Strimovanje"
+Basic.Settings.Output.Adv.Audio.Track1="Izvor 1"
+Basic.Settings.Output.Adv.Audio.Track2="Izvor 2"
+Basic.Settings.Output.Adv.Audio.Track3="Izvor 3"
+Basic.Settings.Output.Adv.Audio.Track4="Izvor 4"
+
+Basic.Settings.Output.Adv.Recording="Snimanje"
+Basic.Settings.Output.Adv.Recording.Type="Vrsta"
+Basic.Settings.Output.Adv.Recording.Type.Standard="Uobičajeni"
+Basic.Settings.Output.Adv.Recording.Type.FFmpegOutput="Prilagođeni izlaz (FFmpeg)"
+Basic.Settings.Output.Adv.Recording.UseStreamEncoder="(Koristi strim enkoder)"
+Basic.Settings.Output.Adv.FFmpeg.SaveFilter.Common="Uobičajeni formati snimaka"
+Basic.Settings.Output.Adv.FFmpeg.SaveFilter.All="Sve datoteke"
+Basic.Settings.Output.Adv.FFmpeg.SavePathURL="Putanja datoteke ili URL"
+Basic.Settings.Output.Adv.FFmpeg.VEncoder="Video enkoder (prazno=podrazumevani)"
+Basic.Settings.Output.Adv.FFmpeg.VEncoderSettings="Podešavanja video enkodera (ako postoje)"
+Basic.Settings.Output.Adv.FFmpeg.AEncoder="Zvučni enkoder (prazno=podrazumevani)"
+Basic.Settings.Output.Adv.FFmpeg.AEncoderSettings="Podešavanja zvučnog enkodera (ako postoje)"
 
 Basic.Settings.Video="Video"
 Basic.Settings.Video.Adapter="Video adapter:"
@@ -212,6 +245,10 @@
 Basic.Settings.Video.InvalidResolution="Neispravna vrednost rezolucije. Mora biti [width]x[height] (npr. 1920x1080)"
 Basic.Settings.Video.CurrentlyActive="Video izlaz je trenutno aktivan. Molim isključite sve izlaze da promenite video podešavanja."
 
+Basic.Settings.Video.DownscaleFilter.Bilinear="Bilinear (najbrže, ali mutno pri skaliranju)"
+Basic.Settings.Video.DownscaleFilter.Bicubic="Bicubic (oštrije skaliranje, 16 uzoraka)"
+Basic.Settings.Video.DownscaleFilter.Lanczos="Lanczos (oštrije skaliranje, 32 uzorka)"
+
 Basic.Settings.Audio="Zvuk"
 Basic.Settings.Audio.SampleRate="Protok"
 Basic.Settings.Audio.Channels="Kanali"
@@ -221,3 +258,12 @@
 Basic.Settings.Audio.AuxDevice2="Mikrofon/Ulaz 2"
 Basic.Settings.Audio.AuxDevice3="Mikrofon/Ulaz 3"
 
+
+Basic.AdvAudio="Napredna podešavanja zvuka"
+Basic.AdvAudio.Name="Ime"
+Basic.AdvAudio.Volume="Glasnoća (%)"
+Basic.AdvAudio.Mono="Spoji u mono"
+Basic.AdvAudio.Panning="Pomeranje"
+Basic.AdvAudio.SyncOffset="Razlika u sinhronizaciji (ms)"
+Basic.AdvAudio.AudioTracks="Izvori"
+

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/obs/data/locale/hu-HU.ini -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/obs/data/locale/hu-HU.ini Changed

@@ -14,6 +14,7 @@
 MoveUp="Mozgatás Fel"
 MoveDown="Mozgatás Le"
 Settings="Beállítások"
+Name="Név"
 Exit="Kilépés"
 Mixer="Keverő"
 Browse="Tallózás"
@@ -27,6 +28,9 @@
 NoNameEntered.Title="Kérem adjon meg egy érvényes nevet"
 NoNameEntered.Text="Üres nevek nem használhatóak."
 
+ConfirmExit.Title="Kilép a programból?"
+ConfirmExit.Text="Az OBS jelenleg aktív. Biztosan ki szeretne lépni?"
+
 ConfirmRemove.Title="Eltávolítás Megerősítése"
 ConfirmRemove.Text="\"$1\" eltávolítására készül, biztos benne?"
 
@@ -90,6 +94,8 @@
 Basic.PropertiesWindow.AutoSelectFormat="%1 (nem támogatott; autokiválasztás: %2)"
 Basic.PropertiesWindow.SelectColor="Szín Kiválasztása"
 Basic.PropertiesWindow.SelectFont="Betűtípus kiválasztása"
+Basic.PropertiesWindow.ConfirmTitle="Beállítások Módosultak"
+Basic.PropertiesWindow.Confirm="Változtatásai nincsenek elmentve. Szeretné megtartani őket?"
 
 Basic.InteractionWindow="Egymásra hatnak \"%1\"-el"
 
@@ -163,6 +169,7 @@
 Basic.MainMenu.Edit.Order.MoveDown="Mozgatás &Le"
 Basic.MainMenu.Edit.Order.MoveToTop="Mozgatás a &Tetejére"
 Basic.MainMenu.Edit.Order.MoveToBottom="Mozgatás az &Aljára"
+Basic.MainMenu.Edit.AdvAudio="&Speciális Audio Tulajdonságok"
 
 Basic.MainMenu.Help="&Segítség"
 Basic.MainMenu.Help.Logs="&Naplófájlok"
@@ -182,9 +189,13 @@
 Basic.Settings.Stream.StreamType="Stream típusa"
 
 Basic.Settings.Output="Kimenet"
+Basic.Settings.Output.Encoder="Kódoló"
+Basic.Settings.Output.SelectDirectory="Felvételi Könyvtár Kiválasztása"
+Basic.Settings.Output.SelectFile="Felvétel Fájljának Kiválasztása"
 Basic.Settings.Output.Mode="Kimeneti Mód"
-Basic.Settings.Output.Mode.Simple="Egyszerű (Stream és/vagy felvétel)"
-Basic.Settings.Output.Mode.Advanced="Speciális (Egyéni kimeneti típus)"
+Basic.Settings.Output.Mode.Simple="Egyszerű"
+Basic.Settings.Output.Mode.Adv="Haladó"
+Basic.Settings.Output.Mode.FFmpeg="FFmpeg Kimenet"
 Basic.Settings.Output.Simple.SavePath="FLV felvétel elérési útja"
 Basic.Settings.Output.VideoBitrate="Videó Bitráta"
 Basic.Settings.Output.AudioBitrate="Audio Bitráta"
@@ -192,9 +203,31 @@
 Basic.Settings.Output.RetryDelay="Újrapróbálkozás Késleltetése (másodperc)"
 Basic.Settings.Output.MaxRetries="Újrapróbálkozások Maximális Száma"
 Basic.Settings.Output.Advanced="Speciális Kódoló beállítások engedélyezése"
-Basic.Settings.Output.X264Preset="x264 készlet"
-Basic.Settings.Output.CustomX264Settings="Egyedi x264 Beállítások"
+Basic.Settings.Output.EncoderPreset="Kódoló Készlet (magasabb = kevesebb CPU igény)"
+Basic.Settings.Output.CustomEncoderSettings="Egyéni Kódolási Beállítások"
 Basic.Settings.Output.UseCBR="Konstans bitráta használata"
+Basic.Settings.Output.UseBufferSize="Egyéni pufferméret használata"
+
+Basic.Settings.Output.Adv.Rescale="Kimenet Átméretezése"
+Basic.Settings.Output.Adv.AudioTrack="Hangsáv"
+Basic.Settings.Output.Adv.Streaming="Streamelés"
+Basic.Settings.Output.Adv.Audio.Track1="Sáv 1"
+Basic.Settings.Output.Adv.Audio.Track2="Sáv 2"
+Basic.Settings.Output.Adv.Audio.Track3="Sáv 3"
+Basic.Settings.Output.Adv.Audio.Track4="Sáv 4"
+
+Basic.Settings.Output.Adv.Recording="Rögzítés"
+Basic.Settings.Output.Adv.Recording.Type="Típus"
+Basic.Settings.Output.Adv.Recording.Type.Standard="Szabvány"
+Basic.Settings.Output.Adv.Recording.Type.FFmpegOutput="Egyéni Kimenet (FFmpeg)"
+Basic.Settings.Output.Adv.Recording.UseStreamEncoder="(Stream kódoló használata)"
+Basic.Settings.Output.Adv.FFmpeg.SaveFilter.Common="Általános felvételi formátumok"
+Basic.Settings.Output.Adv.FFmpeg.SaveFilter.All="Minden fájl"
+Basic.Settings.Output.Adv.FFmpeg.SavePathURL="Fájl elérési útja vagy URL"
+Basic.Settings.Output.Adv.FFmpeg.VEncoder="Videó Kódoló (üres = alapértelmezett)"
+Basic.Settings.Output.Adv.FFmpeg.VEncoderSettings="Videó Kódoló Beállítások (ha van)"
+Basic.Settings.Output.Adv.FFmpeg.AEncoder="Audio Kódoló (üres = alapértelmezett)"
+Basic.Settings.Output.Adv.FFmpeg.AEncoderSettings="Audio Kódoló Beállítások (ha van)"
 
 Basic.Settings.Video="Videó"
 Basic.Settings.Video.Adapter="Videó Adapter:"
@@ -212,6 +245,10 @@
 Basic.Settings.Video.InvalidResolution="Érvénytelen felbontás érték. [szélesség] x [magasság]-nak kell lennie (pl.: 1920 x 1080)"
 Basic.Settings.Video.CurrentlyActive="Video kimenet jelenleg aktív. Kérem, kapcsoljon ki minden kimeneti forrást a video beállítások módosításához."
 
+Basic.Settings.Video.DownscaleFilter.Bilinear="Bilineáris (leggyorsabb, homályos lehet méretezésnél)"
+Basic.Settings.Video.DownscaleFilter.Bicubic="Kettős köbös (élesített méretezés, 16 minta)"
+Basic.Settings.Video.DownscaleFilter.Lanczos="Lanczos (élesített méretezés, 32 minta)"
+
 Basic.Settings.Audio="Hang"
 Basic.Settings.Audio.SampleRate="Mintavételezés"
 Basic.Settings.Audio.Channels="Csatornák"
@@ -221,3 +258,12 @@
 Basic.Settings.Audio.AuxDevice2="Mikrofon/Aux Audio eszköz 2"
 Basic.Settings.Audio.AuxDevice3="Mikrofon/Aux Audio eszköz 3"
 
+
+Basic.AdvAudio="Speciális Audio Tulajdonságok"
+Basic.AdvAudio.Name="Név"
+Basic.AdvAudio.Volume="Hangerő (%)"
+Basic.AdvAudio.Mono="Monora lekeverés"
+Basic.AdvAudio.Panning="Keverő"
+Basic.AdvAudio.SyncOffset="Szinkron eltolás (ms)"
+Basic.AdvAudio.AudioTracks="Sávok"
+

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/obs/data/locale/it-IT.ini -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/obs/data/locale/it-IT.ini Changed

@@ -27,6 +27,7 @@
 NoNameEntered.Title="Inserisci un nome valido"
 NoNameEntered.Text="Non è possibile utilizzare nomi vuoti."
 
+
 ConfirmRemove.Title="Conferma la rimozione"
 ConfirmRemove.Text="Sei sicuro di voler rimuovere '$1'?"
 
@@ -183,8 +184,6 @@
 
 Basic.Settings.Output="Output"
 Basic.Settings.Output.Mode="Modalità di output"
-Basic.Settings.Output.Mode.Simple="Semplice (trasmetti e/o registra)"
-Basic.Settings.Output.Mode.Advanced="Avanzata (tipo di output personalizzato)"
 Basic.Settings.Output.Simple.SavePath="Percorso di salvataggio per file FLV"
 Basic.Settings.Output.VideoBitrate="Bitrate video"
 Basic.Settings.Output.AudioBitrate="Bitrate Audio"
@@ -192,10 +191,10 @@
 Basic.Settings.Output.RetryDelay="Ritardo dei tentativi (secondi)"
 Basic.Settings.Output.MaxRetries="Tentativi massimi"
 Basic.Settings.Output.Advanced="Abilita le impostazioni avanzate di codifica"
-Basic.Settings.Output.X264Preset="x264 Preset"
-Basic.Settings.Output.CustomX264Settings="Impostazioni personalizzate x264"
 Basic.Settings.Output.UseCBR="Usa Bitrate costante"
 
+
+
 Basic.Settings.Video="Video"
 Basic.Settings.Video.Adapter="Adattatore video:"
 Basic.Settings.Video.BaseResolution="Risoluzione di base:"
@@ -212,6 +211,7 @@
 Basic.Settings.Video.InvalidResolution="Valore di risoluzione invalido. Deve essere [larghezza]x[altezza] (es. 1920x1080)"
 Basic.Settings.Video.CurrentlyActive="L'output video è attualmente attivo. Spegni qualunque output per cambiare le impostazioni."
 
+
 Basic.Settings.Audio="Audio"
 Basic.Settings.Audio.SampleRate="Ratio di campionamento"
 Basic.Settings.Audio.Channels="Canali"
@@ -221,3 +221,5 @@
 Basic.Settings.Audio.AuxDevice2="Dispositivo audio mic/ausiliario 2"
 Basic.Settings.Audio.AuxDevice3="Dispositivo audio mic/ausiliario 3"
 
+
+

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/obs/data/locale/ja-JP.ini -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/obs/data/locale/ja-JP.ini Changed

@@ -14,9 +14,10 @@
 MoveUp="上へ移動"
 MoveDown="下へ移動"
 Settings="設定"
+Name="名称"
 Exit="終了"
 Mixer="ミキサー"
-Browse="ブラウズ"
+Browse="参照"
 Mono="モノラル"
 Stereo="ステレオ"
 DroppedFrames="ドロップしたフレーム %1 (%2%)"
@@ -27,6 +28,9 @@
 NoNameEntered.Title="有効な名前を入力してください"
 NoNameEntered.Text="空の名前を使用することはできません。"
 
+ConfirmExit.Title="OBSを終了しますか？"
+ConfirmExit.Text="OBS は現在アクティブです。終了してもよろしいですか？"
+
 ConfirmRemove.Title="削除の確認"
 ConfirmRemove.Text="'$1' を削除してもよろしいですか？"
 
@@ -90,6 +94,8 @@
 Basic.PropertiesWindow.AutoSelectFormat="%1 (サポートされていない; 自動選択: %2)"
 Basic.PropertiesWindow.SelectColor="色を選択"
 Basic.PropertiesWindow.SelectFont="フォントを選択"
+Basic.PropertiesWindow.ConfirmTitle="設定の変更"
+Basic.PropertiesWindow.Confirm="保存されていない変更があります。それらを維持しますか？"
 
 Basic.InteractionWindow="'%1' との相互作用"
 
@@ -163,6 +169,7 @@
 Basic.MainMenu.Edit.Order.MoveDown="下に移動(&D)"
 Basic.MainMenu.Edit.Order.MoveToTop="最上部に移動(&T)"
 Basic.MainMenu.Edit.Order.MoveToBottom="最下部に移動(&B)"
+Basic.MainMenu.Edit.AdvAudio="オーディオの詳細プロパティ"
 
 Basic.MainMenu.Help="ヘルプ(&H)"
 Basic.MainMenu.Help.Logs="ログファイル(&L)"
@@ -182,9 +189,13 @@
 Basic.Settings.Stream.StreamType="配信種別"
 
 Basic.Settings.Output="出力"
+Basic.Settings.Output.Encoder="エンコーダー"
+Basic.Settings.Output.SelectDirectory="録画ディレクトリを選択"
+Basic.Settings.Output.SelectFile="録画ファイルを選択"
 Basic.Settings.Output.Mode="出力モード"
-Basic.Settings.Output.Mode.Simple="基本 (配信 / 録画)"
-Basic.Settings.Output.Mode.Advanced="上級 (カスタム出力タイプ)"
+Basic.Settings.Output.Mode.Simple="基本"
+Basic.Settings.Output.Mode.Adv="詳細"
+Basic.Settings.Output.Mode.FFmpeg="FFmpeg の出力"
 Basic.Settings.Output.Simple.SavePath="FLV 録画ファイルパス"
 Basic.Settings.Output.VideoBitrate="映像ビット レート"
 Basic.Settings.Output.AudioBitrate="音声ビットレート"
@@ -192,9 +203,32 @@
 Basic.Settings.Output.RetryDelay="再試行の遅延 (秒)"
 Basic.Settings.Output.MaxRetries="最大再試行回数"
 Basic.Settings.Output.Advanced="高度なエンコーダーの設定を有効にする"
-Basic.Settings.Output.X264Preset="x264 プリセット"
-Basic.Settings.Output.CustomX264Settings="x264 のカスタム設定"
+Basic.Settings.Output.EncoderPreset="エンコーダープリセット (高い = CPU使用低い)"
+Basic.Settings.Output.CustomEncoderSettings="エンコーダーのカスタム設定"
 Basic.Settings.Output.UseCBR="固定ビットレートを使用する"
+Basic.Settings.Output.UseBufferSize="特定バッファサイズを使用"
+
+Basic.Settings.Output.Adv.Rescale="出力をリスケールする"
+Basic.Settings.Output.Adv.AudioTrack="オーディオ トラック"
+Basic.Settings.Output.Adv.Streaming="配信"
+Basic.Settings.Output.Adv.ApplyServiceSettings="ストリーミングサービスのエンコーダ設定を適用する"
+Basic.Settings.Output.Adv.Audio.Track1="トラック 1"
+Basic.Settings.Output.Adv.Audio.Track2="トラック 2"
+Basic.Settings.Output.Adv.Audio.Track3="トラック 3"
+Basic.Settings.Output.Adv.Audio.Track4="トラック 4"
+
+Basic.Settings.Output.Adv.Recording="録画"
+Basic.Settings.Output.Adv.Recording.Type="種別"
+Basic.Settings.Output.Adv.Recording.Type.Standard="標準"
+Basic.Settings.Output.Adv.Recording.Type.FFmpegOutput="カスタム出力 (FFmpeg)"
+Basic.Settings.Output.Adv.Recording.UseStreamEncoder="(ストリームエンコーダーを使用)"
+Basic.Settings.Output.Adv.FFmpeg.SaveFilter.Common="共通の録画フォーマット"
+Basic.Settings.Output.Adv.FFmpeg.SaveFilter.All="すべてのファイル"
+Basic.Settings.Output.Adv.FFmpeg.SavePathURL="ファイルパス または URL"
+Basic.Settings.Output.Adv.FFmpeg.VEncoder="ビデオエンコーダー (空白 = デフォルト)"
+Basic.Settings.Output.Adv.FFmpeg.VEncoderSettings="ビデオエンコーダー設定 (ある場合)"
+Basic.Settings.Output.Adv.FFmpeg.AEncoder="オーディオエンコーダー (空白 = デフォルト)"
+Basic.Settings.Output.Adv.FFmpeg.AEncoderSettings="オーディオエンコーダー設定 (ある場合)"
 
 Basic.Settings.Video="映像"
 Basic.Settings.Video.Adapter="ビデオアダプター:"
@@ -212,6 +246,10 @@
 Basic.Settings.Video.InvalidResolution="解像度の値が不正です。[幅]x[高さ] (例 1920x1080)にしてください"
 Basic.Settings.Video.CurrentlyActive="映像出力中です。映像設定を変更するには出力を停止してください。"
 
+Basic.Settings.Video.DownscaleFilter.Bilinear="バイリニア（スケーリングする場合ぼやけているが最速）"
+Basic.Settings.Video.DownscaleFilter.Bicubic="バイキュービック（先鋭化スケーリング、16 のサンプル）"
+Basic.Settings.Video.DownscaleFilter.Lanczos="ランチョス（先鋭化スケーリング、32 のサンプル）"
+
 Basic.Settings.Audio="音声"
 Basic.Settings.Audio.SampleRate="サンプリングレート"
 Basic.Settings.Audio.Channels="チャンネル"
@@ -221,3 +259,12 @@
 Basic.Settings.Audio.AuxDevice2="マイク音声デバイス 2"
 Basic.Settings.Audio.AuxDevice3="マイク音声デバイス 3"
 
+
+Basic.AdvAudio="オーディオの詳細プロパティ"
+Basic.AdvAudio.Name="名称"
+Basic.AdvAudio.Volume="音量 (%)"
+Basic.AdvAudio.Mono="モノラルにダウンミックス"
+Basic.AdvAudio.Panning="パンニング"
+Basic.AdvAudio.SyncOffset="同期オフセット (ミリ秒)"
+Basic.AdvAudio.AudioTracks="トラック"
+

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/obs/data/locale/ko-KR.ini -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/obs/data/locale/ko-KR.ini Changed

@@ -5,6 +5,8 @@
 OK="확인"
 Apply="적용"
 Cancel="취소"
+Save="저장"
+Discard="저장 안함"
 Yes="예"
 No="아니오"
 Add="추가"
@@ -14,6 +16,7 @@
 MoveUp="위로 올리기"
 MoveDown="아래로 내리기"
 Settings="설정"
+Name="이름"
 Exit="끝내기"
 Mixer="믹서"
 Browse="찾아보기"
@@ -27,6 +30,9 @@
 NoNameEntered.Title="유효한 이름을 입력하십시오"
 NoNameEntered.Text="이름을 반드시 지정해야 합니다."
 
+ConfirmExit.Title="OBS를 종료합니까?"
+ConfirmExit.Text="OBS가 현재 작동 중입니다. 정말로 종료할까요?"
+
 ConfirmRemove.Title="제거 확인"
 ConfirmRemove.Text="'$1'을 정말로 제거하시겠습니까?"
 
@@ -90,6 +96,8 @@
 Basic.PropertiesWindow.AutoSelectFormat="%1 (미지원; 자동 선택: %2)"
 Basic.PropertiesWindow.SelectColor="색상 지정"
 Basic.PropertiesWindow.SelectFont="글꼴 선택"
+Basic.PropertiesWindow.ConfirmTitle="설정이 변경됨"
+Basic.PropertiesWindow.Confirm="아직 저장하지 않은 변경 사항이 있습니다. 변경을 유지하겠습니까?"
 
 Basic.InteractionWindow="'%1' 과 상호 작용"
 
@@ -163,6 +171,7 @@
 Basic.MainMenu.Edit.Order.MoveDown="아래로 내리기(&D)"
 Basic.MainMenu.Edit.Order.MoveToTop="가장 위로 올리기(&T)"
 Basic.MainMenu.Edit.Order.MoveToBottom="가장 아래로 내리기(&B)"
+Basic.MainMenu.Edit.AdvAudio="오디오 고급 설정(&A)"
 
 Basic.MainMenu.Help="도움말(&H)"
 Basic.MainMenu.Help.Logs="기록 파일(&L)"
@@ -182,9 +191,13 @@
 Basic.Settings.Stream.StreamType="방송 형식"
 
 Basic.Settings.Output="출력"
+Basic.Settings.Output.Encoder="인코더"
+Basic.Settings.Output.SelectDirectory="녹화 경로 선택"
+Basic.Settings.Output.SelectFile="녹화 파일 선택"
 Basic.Settings.Output.Mode="출력 모드"
-Basic.Settings.Output.Mode.Simple="간단 (방송 그리고/또는 녹화)"
-Basic.Settings.Output.Mode.Advanced="고급 (사용자 정의 출력 형식)"
+Basic.Settings.Output.Mode.Simple="단순"
+Basic.Settings.Output.Mode.Adv="고급"
+Basic.Settings.Output.Mode.FFmpeg="FFmpeg 출력"
 Basic.Settings.Output.Simple.SavePath="FLV 녹화 경로"
 Basic.Settings.Output.VideoBitrate="비디오 비트레이트"
 Basic.Settings.Output.AudioBitrate="오디오 비트레이트"
@@ -192,9 +205,32 @@
 Basic.Settings.Output.RetryDelay="재접속 간격 (초 단위)"
 Basic.Settings.Output.MaxRetries="최대 재시도 횟수"
 Basic.Settings.Output.Advanced="고급 인코더 설정 활성화"
-Basic.Settings.Output.X264Preset="x264 사전설정"
-Basic.Settings.Output.CustomX264Settings="사용자 임의 x264 설정"
+Basic.Settings.Output.EncoderPreset="인코더 사전설정 (높음 = 적은 CPU 부담)"
+Basic.Settings.Output.CustomEncoderSettings="사용자 임의 인코더 설정"
 Basic.Settings.Output.UseCBR="고정 비트레이트 사용"
+Basic.Settings.Output.UseBufferSize="사용자 임의 버퍼  크기 설정"
+
+Basic.Settings.Output.Adv.Rescale="출력  배율 재조정"
+Basic.Settings.Output.Adv.AudioTrack="오디오 트랙"
+Basic.Settings.Output.Adv.Streaming="방송"
+Basic.Settings.Output.Adv.ApplyServiceSettings="방송 서비스 인코더 설정 강제 적용"
+Basic.Settings.Output.Adv.Audio.Track1="트랙 1"
+Basic.Settings.Output.Adv.Audio.Track2="트랙 2"
+Basic.Settings.Output.Adv.Audio.Track3="트랙 3"
+Basic.Settings.Output.Adv.Audio.Track4="트랙 4"
+
+Basic.Settings.Output.Adv.Recording="녹화"
+Basic.Settings.Output.Adv.Recording.Type="형식"
+Basic.Settings.Output.Adv.Recording.Type.Standard="표준"
+Basic.Settings.Output.Adv.Recording.Type.FFmpegOutput="임의 출력 (FFmpeg)"
+Basic.Settings.Output.Adv.Recording.UseStreamEncoder="(스트림 인코더 사용)"
+Basic.Settings.Output.Adv.FFmpeg.SaveFilter.Common="표준 녹화 형식"
+Basic.Settings.Output.Adv.FFmpeg.SaveFilter.All="모든 파일"
+Basic.Settings.Output.Adv.FFmpeg.SavePathURL="파일 경로 또는 URL"
+Basic.Settings.Output.Adv.FFmpeg.VEncoder="비디오 인코더 (공백 = 기본값)"
+Basic.Settings.Output.Adv.FFmpeg.VEncoderSettings="비디오 인코더 설정 (지원되는 경우)"
+Basic.Settings.Output.Adv.FFmpeg.AEncoder="오디오 인코더 (공백 = 기본값)"
+Basic.Settings.Output.Adv.FFmpeg.AEncoderSettings="오디오 인코더 설정 (지원되는 경우)"
 
 Basic.Settings.Video="비디오"
 Basic.Settings.Video.Adapter="비디오 어댑터:"
@@ -212,6 +248,10 @@
 Basic.Settings.Video.InvalidResolution="잘못된 값이 입력되었습니다. 반드시 [폭]x[높이]의 형식이어야 합니다. (예 1920x1080)"
 Basic.Settings.Video.CurrentlyActive="비디오가 현재 출력되고 있습니다. 비디오 설정을 변경하려면 관련 작업을 중단해야 합니다."
 
+Basic.Settings.Video.DownscaleFilter.Bilinear="Bilinear (가장 빠르지만 크기가 변경 시 영상이 흐려짐 )"
+Basic.Settings.Video.DownscaleFilter.Bicubic="Bicubic (영상 크기 변경을 좀 더 날카롭게 처리, 16 샘플)"
+Basic.Settings.Video.DownscaleFilter.Lanczos="Lanczos (영상 크기 변경을 좀 더 날카롭게 처리, 32 샘플)"
+
 Basic.Settings.Audio="오디오"
 Basic.Settings.Audio.SampleRate="샘플 레이트"
 Basic.Settings.Audio.Channels="채널"
@@ -221,3 +261,12 @@
 Basic.Settings.Audio.AuxDevice2="마이크/보조 오디오 장치 2"
 Basic.Settings.Audio.AuxDevice3="마이크/보조 오디오 장치 3"
 
+
+Basic.AdvAudio="오디오 고급 설정"
+Basic.AdvAudio.Name="이름"
+Basic.AdvAudio.Volume="볼륨 (%)"
+Basic.AdvAudio.Mono="모노로 강제 송출"
+Basic.AdvAudio.Panning="패닝"
+Basic.AdvAudio.SyncOffset="싱크 오프셋 (ms)"
+Basic.AdvAudio.AudioTracks="트랙"
+

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/obs/data/locale/nb-NO.ini -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/obs/data/locale/nb-NO.ini Changed

@@ -5,6 +5,8 @@
 OK="OK"
 Apply="Bruk"
 Cancel="Avbryt"
+Save="Lagre"
+Discard="Forkast"
 Yes="Ja"
 No="Nei"
 Add="Legg til"
@@ -14,6 +16,7 @@
 MoveUp="Flytt opp"
 MoveDown="Flytt ned"
 Settings="Innstillinger"
+Name="Navn"
 Exit="Avslutt"
 Mixer="Mikser"
 Browse="Bla gjennom"
@@ -27,6 +30,9 @@
 NoNameEntered.Title="Vennligst oppgi et gyldig navn"
 NoNameEntered.Text="Du kan ikke bruke et tomt navn."
 
+ConfirmExit.Title="Avslutt OBS?"
+ConfirmExit.Text="OBS er aktivt, er du sikker på at du vil avslutte?"
+
 ConfirmRemove.Title="Bekreft Fjerning"
 ConfirmRemove.Text="Er du sikker på at du vil fjerne '$1'?"
 
@@ -90,6 +96,8 @@
 Basic.PropertiesWindow.AutoSelectFormat="%1 (ikke støttet; auto-velg: %2)"
 Basic.PropertiesWindow.SelectColor="Velg farge"
 Basic.PropertiesWindow.SelectFont="Velg skrifttype"
+Basic.PropertiesWindow.ConfirmTitle="Innstillingene er endret"
+Basic.PropertiesWindow.Confirm="Det er ulagra endringer. Vil du beholde dem?"
 
 Basic.InteractionWindow="Kommuniserer med «%1»"
 
@@ -163,6 +171,7 @@
 Basic.MainMenu.Edit.Order.MoveDown="Flytt &ned"
 Basic.MainMenu.Edit.Order.MoveToTop="Legg på &toppen"
 Basic.MainMenu.Edit.Order.MoveToBottom="Legg på &bunnen"
+Basic.MainMenu.Edit.AdvAudio="&Avanserte lydinstillinger"
 
 Basic.MainMenu.Help="&Hjelp"
 Basic.MainMenu.Help.Logs="&Loggfiler"
@@ -182,9 +191,13 @@
 Basic.Settings.Stream.StreamType="Strømmetype"
 
 Basic.Settings.Output="Innspilling"
+Basic.Settings.Output.Encoder="Koder"
+Basic.Settings.Output.SelectDirectory="Velg opptaksmappe"
+Basic.Settings.Output.SelectFile="Velg opptaksfil"
 Basic.Settings.Output.Mode="Innspillingsmodus"
-Basic.Settings.Output.Mode.Simple="Lett (Strøm og/eller ta opp)"
-Basic.Settings.Output.Mode.Advanced="Avansert (Tilpasset inspillingstyper)"
+Basic.Settings.Output.Mode.Simple="Enkel"
+Basic.Settings.Output.Mode.Adv="Avansert"
+Basic.Settings.Output.Mode.FFmpeg="FFmpeg produkt"
 Basic.Settings.Output.Simple.SavePath="FLV Opptaksbane"
 Basic.Settings.Output.VideoBitrate="Bildeoverføringshastighet"
 Basic.Settings.Output.AudioBitrate="Lydoverføringshastighet"
@@ -192,9 +205,32 @@
 Basic.Settings.Output.RetryDelay="Opphold mellom tilkoblingsforsøk (sekunder)"
 Basic.Settings.Output.MaxRetries="Høyst antall tilkoblingsforsøk"
 Basic.Settings.Output.Advanced="Aktiver Avanserte Koderinstillinger"
-Basic.Settings.Output.X264Preset="x264-forhåndsinnstilling"
-Basic.Settings.Output.CustomX264Settings="Egendefinerte x264 innstillinger"
+Basic.Settings.Output.EncoderPreset="Koderforhåndsinstilling (raskere gir mindre prosessorbelastning)"
+Basic.Settings.Output.CustomEncoderSettings="Egendefinert koderinstilling"
 Basic.Settings.Output.UseCBR="Bruk Konstant Bitrate"
+Basic.Settings.Output.UseBufferSize="Bruk egendefinert bufferstørrelse"
+
+Basic.Settings.Output.Adv.Rescale="Reskaler produkt"
+Basic.Settings.Output.Adv.AudioTrack="Lydspor"
+Basic.Settings.Output.Adv.Streaming="Strømming"
+Basic.Settings.Output.Adv.ApplyServiceSettings="Bruk strømmetjenerens koderinstillinger"
+Basic.Settings.Output.Adv.Audio.Track1="Spor 1"
+Basic.Settings.Output.Adv.Audio.Track2="Spor 2"
+Basic.Settings.Output.Adv.Audio.Track3="Spor 3"
+Basic.Settings.Output.Adv.Audio.Track4="Spor 4"
+
+Basic.Settings.Output.Adv.Recording="Opptak"
+Basic.Settings.Output.Adv.Recording.Type="Type"
+Basic.Settings.Output.Adv.Recording.Type.Standard="Standard"
+Basic.Settings.Output.Adv.Recording.Type.FFmpegOutput="Egendefinert FFmpeg produkt"
+Basic.Settings.Output.Adv.Recording.UseStreamEncoder="(Bruk strømkoder)"
+Basic.Settings.Output.Adv.FFmpeg.SaveFilter.Common="Vanlige opptaksformater"
+Basic.Settings.Output.Adv.FFmpeg.SaveFilter.All="Alle filer"
+Basic.Settings.Output.Adv.FFmpeg.SavePathURL="Filbane eller URL"
+Basic.Settings.Output.Adv.FFmpeg.VEncoder="Videokoder (standard hvis uangitt)"
+Basic.Settings.Output.Adv.FFmpeg.VEncoderSettings="Videokoderinstillinger (hvis noen)"
+Basic.Settings.Output.Adv.FFmpeg.AEncoder="Lydkoder (standard hvis uangitt)"
+Basic.Settings.Output.Adv.FFmpeg.AEncoderSettings="Lydkoderinstillinger (hvis noen)"
 
 Basic.Settings.Video="Bilde"
 Basic.Settings.Video.Adapter="Bildeadapter:"
@@ -212,6 +248,10 @@
 Basic.Settings.Video.InvalidResolution="Ugyldig oppløsningsverdi. Må være [bredde]x[høyde] (f.eks. 1920x1080)"
 Basic.Settings.Video.CurrentlyActive="Bildeinnspilling er aktiv. Vennligst skru av alle innspillinger for å endre bildeinstillingene"
 
+Basic.Settings.Video.DownscaleFilter.Bilinear="Bilineær (raskest, men uskarp ved skalering)"
+Basic.Settings.Video.DownscaleFilter.Bicubic="Bikubisk (skjerpet skalering, 16 prøver)"
+Basic.Settings.Video.DownscaleFilter.Lanczos="Lanczos (skjerpet skalering, 32 prøver)"
+
 Basic.Settings.Audio="Lyd"
 Basic.Settings.Audio.SampleRate="Samplingsfrekvens"
 Basic.Settings.Audio.Channels="Kanaler"
@@ -221,3 +261,19 @@
 Basic.Settings.Audio.AuxDevice2="Mikrofon/Aux 2"
 Basic.Settings.Audio.AuxDevice3="Mikrofon/Aux 3"
 
+Basic.Settings.Advanced="Avansert"
+Basic.Settings.Advanced.Audio.BufferingTime="Lydbuffertid"
+Basic.Settings.Advanced.Video.ColorFormat="Fargeformat"
+Basic.Settings.Advanced.Video.ColorSpace="YUV fargerom"
+Basic.Settings.Advanced.Video.ColorRange="YUV fargespekter"
+Basic.Settings.Advanced.Video.ColorRange.Partial="Delvis"
+Basic.Settings.Advanced.Video.ColorRange.Full="Full"
+
+Basic.AdvAudio="Avanserte lydinstillinger"
+Basic.AdvAudio.Name="Navn"
+Basic.AdvAudio.Volume="Volum (%)"
+Basic.AdvAudio.Mono="Nedmiks til mono"
+Basic.AdvAudio.Panning="Panorering"
+Basic.AdvAudio.SyncOffset="Synkronerings forskyvning (ms)"
+Basic.AdvAudio.AudioTracks="Spor"
+

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/obs/data/locale/nl-NL.ini -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/obs/data/locale/nl-NL.ini Changed

@@ -14,6 +14,7 @@
 MoveUp="Omhoog Schuiven"
 MoveDown="Omlaag Schuiven"
 Settings="Instellingen"
+Name="Naam"
 Exit="Afsluiten"
 Mixer="Mixer"
 Browse="Bladeren"
@@ -27,6 +28,9 @@
 NoNameEntered.Title="Voer a.u.b. een geldige naam in"
 NoNameEntered.Text="Je kunt geen lege namen gebruiken."
 
+ConfirmExit.Title="OBS Afsluiten?"
+ConfirmExit.Text="OBS is momenteel actief. Weet je zeker dat je af wil sluiten?"
+
 ConfirmRemove.Title="Bevestig het verwijderen"
 ConfirmRemove.Text="Weet je zeker dat je '$1' wil verwijderen?"
 
@@ -90,6 +94,8 @@
 Basic.PropertiesWindow.AutoSelectFormat="%1 (niet ondersteund; automatisch geselecteerd: %2)"
 Basic.PropertiesWindow.SelectColor="Selecteer kleur"
 Basic.PropertiesWindow.SelectFont="Selecteer lettertype"
+Basic.PropertiesWindow.ConfirmTitle="Instellingen Aangepast"
+Basic.PropertiesWindow.Confirm="Er zijn onopgeslagen aanpassingen. Wil je deze bewaren?"
 
 Basic.InteractionWindow="Interactie met '%1'"
 
@@ -163,6 +169,7 @@
 Basic.MainMenu.Edit.Order.MoveDown="Omlaag Schuiven (&D)"
 Basic.MainMenu.Edit.Order.MoveToTop="Naar Boven Schuiven (&T)"
 Basic.MainMenu.Edit.Order.MoveToBottom="Naar Onderen Schuiven (&B)"
+Basic.MainMenu.Edit.AdvAudio="Geavanceerde &Audioinstellingen"
 
 Basic.MainMenu.Help="&Help"
 Basic.MainMenu.Help.Logs="&Logbestanden"
@@ -182,9 +189,13 @@
 Basic.Settings.Stream.StreamType="Stream Type"
 
 Basic.Settings.Output="Uitvoer"
+Basic.Settings.Output.Encoder="Encoder"
+Basic.Settings.Output.SelectDirectory="Selecteer Opnamemap"
+Basic.Settings.Output.SelectFile="Selecteer Opnamebestand"
 Basic.Settings.Output.Mode="Uitvoermodus"
-Basic.Settings.Output.Mode.Simple="Eenvoudig (Streamen en/of opnemen)"
-Basic.Settings.Output.Mode.Advanced="Geavanceerd (Aangepast uitvoertype)"
+Basic.Settings.Output.Mode.Simple="Simpel"
+Basic.Settings.Output.Mode.Adv="Geavanceerd"
+Basic.Settings.Output.Mode.FFmpeg="FFmpeg-uitvoer"
 Basic.Settings.Output.Simple.SavePath="FLV-opname pad"
 Basic.Settings.Output.VideoBitrate="Video Bitrate"
 Basic.Settings.Output.AudioBitrate="Audio Bitrate"
@@ -192,9 +203,32 @@
 Basic.Settings.Output.RetryDelay="Opnieuw proberen na (seconden)"
 Basic.Settings.Output.MaxRetries="Maximaal aantal pogingen"
 Basic.Settings.Output.Advanced="Geavanceerde Encoderinsellingen Inschakelen"
-Basic.Settings.Output.X264Preset="x264 Preset"
-Basic.Settings.Output.CustomX264Settings="Aangepaste x264-instellingen"
+Basic.Settings.Output.EncoderPreset="Encoderinstelling (hoger = minder CPU)"
+Basic.Settings.Output.CustomEncoderSettings="Aangepaste encoderinstellingen"
 Basic.Settings.Output.UseCBR="Gebruik Constante Bitrate"
+Basic.Settings.Output.UseBufferSize="Aangepaste buffergrootte gebruiken"
+
+Basic.Settings.Output.Adv.Rescale="Uitvoer Schalen"
+Basic.Settings.Output.Adv.AudioTrack="Geluidsspoor"
+Basic.Settings.Output.Adv.Streaming="Streamen"
+Basic.Settings.Output.Adv.ApplyServiceSettings="Forceer encoderinstellingen van de streaming dienst"
+Basic.Settings.Output.Adv.Audio.Track1="Spoor 1"
+Basic.Settings.Output.Adv.Audio.Track2="Spoor 2"
+Basic.Settings.Output.Adv.Audio.Track3="Spoor 3"
+Basic.Settings.Output.Adv.Audio.Track4="Spoor 4"
+
+Basic.Settings.Output.Adv.Recording="Opnemen"
+Basic.Settings.Output.Adv.Recording.Type="Type"
+Basic.Settings.Output.Adv.Recording.Type.Standard="Standaard"
+Basic.Settings.Output.Adv.Recording.Type.FFmpegOutput="Aangepaste Uitvoer (FFmpeg)"
+Basic.Settings.Output.Adv.Recording.UseStreamEncoder="(Gebruik stream encoder)"
+Basic.Settings.Output.Adv.FFmpeg.SaveFilter.Common="Gebruikelijke opnameformaten"
+Basic.Settings.Output.Adv.FFmpeg.SaveFilter.All="Alle Bestanden"
+Basic.Settings.Output.Adv.FFmpeg.SavePathURL="Bestandspad of URL"
+Basic.Settings.Output.Adv.FFmpeg.VEncoder="Video Encoder (leeg = standaard)"
+Basic.Settings.Output.Adv.FFmpeg.VEncoderSettings="Video Encoderinstellingen (indien gewenst)"
+Basic.Settings.Output.Adv.FFmpeg.AEncoder="Audio Encoder (leeg = standaard)"
+Basic.Settings.Output.Adv.FFmpeg.AEncoderSettings="Audio Encoderinstellingen (indien gewenst)"
 
 Basic.Settings.Video="Video"
 Basic.Settings.Video.Adapter="Videoadapter:"
@@ -212,6 +246,10 @@
 Basic.Settings.Video.InvalidResolution="Ongeldige resolutiewaarde.  Moet [breedte] x [hoogte] zijn (bijv. 1920 x 1080)"
 Basic.Settings.Video.CurrentlyActive="Video-uitvoer is momenteel actief. Schakel a.u.b. alle uitvoeren uit om video-instellingen aan te passen."
 
+Basic.Settings.Video.DownscaleFilter.Bilinear="Bilinear (Snelste, maar wazig bij schalen)"
+Basic.Settings.Video.DownscaleFilter.Bicubic="Bicubic (Scherper schalen, 16 samples)"
+Basic.Settings.Video.DownscaleFilter.Lanczos="Lanczos (Scherper schalen, 32 samples)"
+
 Basic.Settings.Audio="Audio"
 Basic.Settings.Audio.SampleRate="Sample Rate"
 Basic.Settings.Audio.Channels="Kanalen"
@@ -221,3 +259,12 @@
 Basic.Settings.Audio.AuxDevice2="Mic/Aux Audioapparaat 2"
 Basic.Settings.Audio.AuxDevice3="Mic/Aux Audioapparaat 3"
 
+
+Basic.AdvAudio="Geavanceerde Audioinstellingen"
+Basic.AdvAudio.Name="Naam"
+Basic.AdvAudio.Volume="Volume (%)"
+Basic.AdvAudio.Mono="Downmixen naar Mono"
+Basic.AdvAudio.Panning="Pannen"
+Basic.AdvAudio.SyncOffset="Sync Offset (ms)"
+Basic.AdvAudio.AudioTracks="Sporen"
+

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/obs/data/locale/pl-PL.ini -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/obs/data/locale/pl-PL.ini Changed

@@ -27,6 +27,7 @@
 NoNameEntered.Title="Proszę wprowadzić prawidłową nazwę"
 NoNameEntered.Text="Nazwa nie może być pusta."
 
+
 ConfirmRemove.Title="Potwierdź usunięcie"
 ConfirmRemove.Text="Czy na pewno chcesz usunąć '$1'?"
 
@@ -169,15 +170,14 @@
 
 Basic.Settings.Output="Wyjście"
 Basic.Settings.Output.Mode="Tryb wyjścia"
-Basic.Settings.Output.Mode.Simple="Prosty (streamowanie i/lub zapis lokalny)"
-Basic.Settings.Output.Mode.Advanced="Zaawansowany (niestandardowy typ wyjścia)"
 Basic.Settings.Output.Simple.SavePath="Ścieżka pliku FLV z nagraniem"
 Basic.Settings.Output.VideoBitrate="Bitrate obrazu"
 Basic.Settings.Output.AudioBitrate="Bitrate dźwięku"
 Basic.Settings.Output.Reconnect="Ponowne łączenie"
 Basic.Settings.Output.RetryDelay="Ponów połączenie (w sekundach)"
 Basic.Settings.Output.MaxRetries="Maksymalna liczba ponownych prób"
-Basic.Settings.Output.CustomX264Settings="Własne ustawienia x264"
+
+
 
 Basic.Settings.Video="Obraz"
 Basic.Settings.Video.Adapter="Karta graficzna:"
@@ -195,6 +195,7 @@
 Basic.Settings.Video.InvalidResolution="Nieprawidłowa rozdzielczość.  Wartość powinna mieć format [szerokość]x[wysokość] (np. 1920x1080)"
 Basic.Settings.Video.CurrentlyActive="Wyjście wideo jest aktywne. Należy wyłączyć wszelkie wyjścia, aby zmienić ustawienia wideo."
 
+
 Basic.Settings.Audio="Dźwięk"
 Basic.Settings.Audio.SampleRate="Częstotliwość próbkowania"
 Basic.Settings.Audio.Channels="Kanały"
@@ -204,3 +205,5 @@
 Basic.Settings.Audio.AuxDevice2="Mikrofon/dodatkowe urządzenie audio 2"
 Basic.Settings.Audio.AuxDevice3="Mikrofon/dodatkowe urządzenie audio 3"
 
+
+

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/obs/data/locale/pt-BR.ini -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/obs/data/locale/pt-BR.ini Changed

@@ -27,6 +27,7 @@
 NoNameEntered.Title="Por favor digite um nome válido"
 NoNameEntered.Text="Você não pode usar nomes vazios."
 
+
 ConfirmRemove.Title="Confirmar a Remoção"
 ConfirmRemove.Text="Tem certeza que deseja remover '$1'?"
 
@@ -168,15 +169,14 @@
 
 Basic.Settings.Output="Saída"
 Basic.Settings.Output.Mode="Modo de Saída"
-Basic.Settings.Output.Mode.Simple="Simples (Stream e/ou gravação)"
-Basic.Settings.Output.Mode.Advanced="Avançado (Definições manuais)"
 Basic.Settings.Output.Simple.SavePath="Caminho de Gravação FLV"
 Basic.Settings.Output.VideoBitrate="Taxa de Bits do Vídeo"
 Basic.Settings.Output.AudioBitrate="Taxa de Bits do Áudio"
 Basic.Settings.Output.Reconnect="Reconectar automaticamente"
 Basic.Settings.Output.RetryDelay="Espera para reconectar-se (segundos)"
 Basic.Settings.Output.MaxRetries="Número Máximo de Tentativas"
-Basic.Settings.Output.CustomX264Settings="Configurações personalizadas do x264"
+
+
 
 Basic.Settings.Video="Vídeo"
 Basic.Settings.Video.Adapter="Adaptador de Vídeo:"
@@ -194,6 +194,7 @@
 Basic.Settings.Video.InvalidResolution="Resolução Inválida, Obrigatório ser [largura]x[altura] (ex. 1920x1080)"
 Basic.Settings.Video.CurrentlyActive="Saída de vídeo está atualmente ativa.  Por favor desligue quaisquer saídas para alterar as configurações de vídeo."
 
+
 Basic.Settings.Audio="Áudio"
 Basic.Settings.Audio.SampleRate="Taxa de Amostragem"
 Basic.Settings.Audio.Channels="Canais"
@@ -203,3 +204,5 @@
 Basic.Settings.Audio.AuxDevice2="Dispositivo de áudio/microfone auxiliar 2"
 Basic.Settings.Audio.AuxDevice3="Dispositivo de áudio/microfone auxiliar 3"
 
+
+

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/obs/data/locale/pt-PT.ini -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/obs/data/locale/pt-PT.ini Changed

@@ -25,6 +25,7 @@
 NameExists.Text="O nome já encontra-se em utilização."
 
 
+
 ConfirmRemove.Title="Comfirmar Remover"
 ConfirmRemove.Text="Tem a certeza que quer remover '$1'?"
 
@@ -163,8 +164,6 @@
 
 Basic.Settings.Output="Saída Output"
 Basic.Settings.Output.Mode="Modo de Saída"
-Basic.Settings.Output.Mode.Simple="Simples (Stream e/ou gravação)"
-Basic.Settings.Output.Mode.Advanced="Avançado (Definições manuais)"
 Basic.Settings.Output.Simple.SavePath="Caminho de Gravação FLV"
 Basic.Settings.Output.VideoBitrate="Bitrate de Vídeo"
 Basic.Settings.Output.AudioBitrate="Bitrate de Áudio"
@@ -172,6 +171,8 @@
 Basic.Settings.Output.RetryDelay="Atraso de Tentatica de Religação (segundos)"
 Basic.Settings.Output.MaxRetries="Número Máximo de Tentativas de Religação"
 
+
+
 Basic.Settings.Video="Vídeo"
 Basic.Settings.Video.Adapter="Adaptador de Vídeo:"
 Basic.Settings.Video.BaseResolution="Resolução de Captura:"
@@ -188,6 +189,7 @@
 Basic.Settings.Video.InvalidResolution="Resolução Inválida, Tem de ser [largura]x[altura] (ex. 1920x1080)"
 Basic.Settings.Video.CurrentlyActive="A Saída de Vídeo encontra-se activa. Por favor desligue a saída de vídeo para mudar as definições de vídeo."
 
+
 Basic.Settings.Audio="Áudio"
 Basic.Settings.Audio.SampleRate="Frequência de Samplagem"
 Basic.Settings.Audio.Channels="Canias"
@@ -197,3 +199,5 @@
 Basic.Settings.Audio.AuxDevice2="Mic/Auxiliary Audio Device 2"
 Basic.Settings.Audio.AuxDevice3="Mic/Auxiliary Audio Device 3"
 
+
+

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/obs/data/locale/ro-RO.ini -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/obs/data/locale/ro-RO.ini Changed

@@ -27,6 +27,7 @@
 NoNameEntered.Title="Va rugăm introduceţi un nume valid"
 NoNameEntered.Text="Nu puteți utiliza un nume gol."
 
+
 ConfirmRemove.Title="Confirmă Ştergere"
 ConfirmRemove.Text="Sigur eliminaţi '$1'?"
 
@@ -90,6 +91,8 @@
 Basic.PropertiesWindow.AutoSelectFormat="%1 (neacceptat; Selectare automată: %2)"
 Basic.PropertiesWindow.SelectColor="Selectaţi culoarea"
 Basic.PropertiesWindow.SelectFont="Selectează Fontul"
+Basic.PropertiesWindow.ConfirmTitle="Setări Schimbate"
+Basic.PropertiesWindow.Confirm="Există modificări nesalvate.  Vrei să le păstrezi?"
 
 Basic.InteractionWindow="Interacționează cu '%1'"
 
@@ -163,6 +166,7 @@
 Basic.MainMenu.Edit.Order.MoveDown="Mută &Jos"
 Basic.MainMenu.Edit.Order.MoveToTop="Mută &Prima"
 Basic.MainMenu.Edit.Order.MoveToBottom="Mută &Ultima"
+Basic.MainMenu.Edit.AdvAudio="&Proprietăţi Audio Avansate"
 
 Basic.MainMenu.Help="&Ajutor"
 Basic.MainMenu.Help.Logs="&Fişierele jurnal"
@@ -183,8 +187,6 @@
 
 Basic.Settings.Output="Ieşire"
 Basic.Settings.Output.Mode="Modul de ieşire"
-Basic.Settings.Output.Mode.Simple="Simplu (Stream si/sau înregistrare)"
-Basic.Settings.Output.Mode.Advanced="Avansat (tip de ieşire personalizat)"
 Basic.Settings.Output.Simple.SavePath="Calea de înregistrare FLV"
 Basic.Settings.Output.VideoBitrate="Video Bitrate"
 Basic.Settings.Output.AudioBitrate="Audio Bitrate"
@@ -192,10 +194,10 @@
 Basic.Settings.Output.RetryDelay="Intârziere reincercare (secunde)"
 Basic.Settings.Output.MaxRetries="Maxim de reîncercări"
 Basic.Settings.Output.Advanced="Activează Setări Codare Avansate"
-Basic.Settings.Output.X264Preset="Presetul x264"
-Basic.Settings.Output.CustomX264Settings="Setări x264 Personalizate"
 Basic.Settings.Output.UseCBR="Utilizează Bitrate Constant"
 
+
+
 Basic.Settings.Video="Video"
 Basic.Settings.Video.Adapter="Adaptor video:"
 Basic.Settings.Video.BaseResolution="Rezoluţia de bază:"
@@ -212,6 +214,10 @@
 Basic.Settings.Video.InvalidResolution="Valoare rezoluţie invalidă.  Trebuie să fie [latime]x[înălţime] (de exemplu, 1920x1080)"
 Basic.Settings.Video.CurrentlyActive="Ieşirea video este în prezent activă.  Vă rugăm să opriţi orice ieşiri pentru a schimba setările video."
 
+Basic.Settings.Video.DownscaleFilter.Bilinear="Biliniar (mai rapid, dar neclar la scalare)"
+Basic.Settings.Video.DownscaleFilter.Bicubic="Bicubic (Scalare ascutita, 16 mostre)"
+Basic.Settings.Video.DownscaleFilter.Lanczos="Lanczos (Scalare ascutita, 32 de mostre)"
+
 Basic.Settings.Audio="Audio"
 Basic.Settings.Audio.SampleRate="Rata de eşantionare"
 Basic.Settings.Audio.Channels="Canale"
@@ -221,3 +227,11 @@
 Basic.Settings.Audio.AuxDevice2="Dispozitiv Audio microfon/auxiliar 2"
 Basic.Settings.Audio.AuxDevice3="Dispozitiv Audio microfon/auxiliar 3"
 
+
+Basic.AdvAudio="Proprietăţi Audio Avansate"
+Basic.AdvAudio.Name="Nume"
+Basic.AdvAudio.Volume="Volum (%)"
+Basic.AdvAudio.Mono="Transformă in Mono"
+Basic.AdvAudio.Panning="Panning"
+Basic.AdvAudio.SyncOffset="Compensare Sincronizare (ms)"
+

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/obs/data/locale/ru-RU.ini -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/obs/data/locale/ru-RU.ini Changed

@@ -5,6 +5,8 @@
 OK="OK"
 Apply="Применить"
 Cancel="Отмена"
+Save="Сохранить"
+Discard="Отклонить"
 Yes="Да"
 No="Нет"
 Add="Добавить"
@@ -14,6 +16,7 @@
 MoveUp="Выше"
 MoveDown="Ниже"
 Settings="Настройки"
+Name="Название"
 Exit="Выход"
 Mixer="Микшер"
 Browse="Обзор"
@@ -27,6 +30,9 @@
 NoNameEntered.Title="Пожалуйста, укажите действительное имя"
 NoNameEntered.Text="Вы не можете использовать пустые имена."
 
+ConfirmExit.Title="Выйти из OBS?"
+ConfirmExit.Text="OBS сейчас активен. Вы уверены, что хотите выйти?"
+
 ConfirmRemove.Title="Подтвердить удаление"
 ConfirmRemove.Text="Вы уверены, что хотите удалить '$1'?"
 
@@ -90,6 +96,8 @@
 Basic.PropertiesWindow.AutoSelectFormat="%1 (неподдерживаемый; Автовыбор: %2)"
 Basic.PropertiesWindow.SelectColor="Выбрать цвет"
 Basic.PropertiesWindow.SelectFont="Выбрать шрифт"
+Basic.PropertiesWindow.ConfirmTitle="Настройки изменены"
+Basic.PropertiesWindow.Confirm="Имеются несохранённые изменения. Желаете сохранить их?"
 
 Basic.InteractionWindow="Взаимодействие с '%1'"
 
@@ -163,6 +171,7 @@
 Basic.MainMenu.Edit.Order.MoveDown="Переместить &Ниже"
 Basic.MainMenu.Edit.Order.MoveToTop="Переместить &Наверх"
 Basic.MainMenu.Edit.Order.MoveToBottom="Переместить &Вниз"
+Basic.MainMenu.Edit.AdvAudio="&Расширенные свойства аудио"
 
 Basic.MainMenu.Help="&Справка"
 Basic.MainMenu.Help.Logs="&Log файлы"
@@ -182,9 +191,13 @@
 Basic.Settings.Stream.StreamType="Тип вещания"
 
 Basic.Settings.Output="Вывод"
+Basic.Settings.Output.Encoder="Кодировщик"
+Basic.Settings.Output.SelectDirectory="Выбрать каталог записи"
+Basic.Settings.Output.SelectFile="Выбрать файл записи"
 Basic.Settings.Output.Mode="Режим вывода"
-Basic.Settings.Output.Mode.Simple="Простой (Прямая трансляция и/или запись)"
-Basic.Settings.Output.Mode.Advanced="Расширенный (Настраиваемый тип вывода)"
+Basic.Settings.Output.Mode.Simple="Простой"
+Basic.Settings.Output.Mode.Adv="Расширенные"
+Basic.Settings.Output.Mode.FFmpeg="Вывод FFmpeg"
 Basic.Settings.Output.Simple.SavePath="Путь для записи FLV"
 Basic.Settings.Output.VideoBitrate="Битрейт видео"
 Basic.Settings.Output.AudioBitrate="Битрейт аудио"
@@ -192,9 +205,32 @@
 Basic.Settings.Output.RetryDelay="Задержка между повторными попытками (с)"
 Basic.Settings.Output.MaxRetries="Максимальное количество повторов"
 Basic.Settings.Output.Advanced="Включить дополнительные настройки кодировщика"
-Basic.Settings.Output.X264Preset="Пресет x264"
-Basic.Settings.Output.CustomX264Settings="Пользовательские настройки x264"
+Basic.Settings.Output.EncoderPreset="Предустановки кодировщика (выше = меньше ЦП)"
+Basic.Settings.Output.CustomEncoderSettings="Пользовательские настройки кодировщика"
 Basic.Settings.Output.UseCBR="Использовать постоянный битрейт"
+Basic.Settings.Output.UseBufferSize="Использовать пользовательский размер буфера"
+
+Basic.Settings.Output.Adv.Rescale="Перемасштабировать вывод"
+Basic.Settings.Output.Adv.AudioTrack="Звуковая дорожка"
+Basic.Settings.Output.Adv.Streaming="Потоковое вещание"
+Basic.Settings.Output.Adv.ApplyServiceSettings="Принудительно использовать настройки кодировщика потоковой службы"
+Basic.Settings.Output.Adv.Audio.Track1="Дорожка 1"
+Basic.Settings.Output.Adv.Audio.Track2="Дорожка 2"
+Basic.Settings.Output.Adv.Audio.Track3="Дорожка 3"
+Basic.Settings.Output.Adv.Audio.Track4="Дорожка 4"
+
+Basic.Settings.Output.Adv.Recording="Запись"
+Basic.Settings.Output.Adv.Recording.Type="Тип"
+Basic.Settings.Output.Adv.Recording.Type.Standard="Обычный"
+Basic.Settings.Output.Adv.Recording.Type.FFmpegOutput="Пользовательский вывод (FFmpeg)"
+Basic.Settings.Output.Adv.Recording.UseStreamEncoder="(Использовать кодировщик потока)"
+Basic.Settings.Output.Adv.FFmpeg.SaveFilter.Common="Общие форматы записи"
+Basic.Settings.Output.Adv.FFmpeg.SaveFilter.All="Все файлы"
+Basic.Settings.Output.Adv.FFmpeg.SavePathURL="Путь к файлу или URL-адрес"
+Basic.Settings.Output.Adv.FFmpeg.VEncoder="Кодировщик видео (пусто = по умолчанию)"
+Basic.Settings.Output.Adv.FFmpeg.VEncoderSettings="Настройки кодировщика видео (если есть)"
+Basic.Settings.Output.Adv.FFmpeg.AEncoder="Кодировщик аудио (пусто = по умолчанию)"
+Basic.Settings.Output.Adv.FFmpeg.AEncoderSettings="Настройки кодировщика аудио (если есть)"
 
 Basic.Settings.Video="Видео"
 Basic.Settings.Video.Adapter="Видеоадаптер:"
@@ -212,6 +248,10 @@
 Basic.Settings.Video.InvalidResolution="Неверное разрешение.  Должно быть [Ширина]x[Высота] (т.е. 1920x1080)"
 Basic.Settings.Video.CurrentlyActive="Видео выход в данный момент активен. Пожалуйста, отключите все выходы, чтобы изменить настройки видео."
 
+Basic.Settings.Video.DownscaleFilter.Bilinear="Билинейный (Быстрый, но размытый при масштабировании)"
+Basic.Settings.Video.DownscaleFilter.Bicubic="Бикубический (Чёткое масштабирование, 16 значений)"
+Basic.Settings.Video.DownscaleFilter.Lanczos="Метод Ланцоша (Чёткое масштабирование, 32 значения)"
+
 Basic.Settings.Audio="Аудио"
 Basic.Settings.Audio.SampleRate="Частота дискретизации"
 Basic.Settings.Audio.Channels="Каналы"
@@ -221,3 +261,19 @@
 Basic.Settings.Audio.AuxDevice2="Mic/Auxiliary Аудиоустройство 2"
 Basic.Settings.Audio.AuxDevice3="Mic/Auxiliary Аудиоустройство 3"
 
+Basic.Settings.Advanced="Расширенные"
+Basic.Settings.Advanced.Audio.BufferingTime="Время буферизации аудио"
+Basic.Settings.Advanced.Video.ColorFormat="Цветовой формат"
+Basic.Settings.Advanced.Video.ColorSpace="Цветовое пространство YUV"
+Basic.Settings.Advanced.Video.ColorRange="Цветовой диапазон YUV"
+Basic.Settings.Advanced.Video.ColorRange.Partial="Частичный"
+Basic.Settings.Advanced.Video.ColorRange.Full="Полный"
+
+Basic.AdvAudio="Расширенные свойства аудио"
+Basic.AdvAudio.Name="Название"
+Basic.AdvAudio.Volume="Громкость (%)"
+Basic.AdvAudio.Mono="Объединение в один канал"
+Basic.AdvAudio.Panning="Панорамирование"
+Basic.AdvAudio.SyncOffset="Смещение синхронизации (мс)"
+Basic.AdvAudio.AudioTracks="Дорожки"
+

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/obs/data/locale/sk-SK.ini -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/obs/data/locale/sk-SK.ini Changed

@@ -27,6 +27,7 @@
 NoNameEntered.Title="Prosím, zadajte platný názov"
 NoNameEntered.Text="Nemôžete použiť prázdne názvy."
 
+
 ConfirmRemove.Title="Potvrdenie odobratia"
 ConfirmRemove.Text="Naozaj si prajete odobrať '$1'?"
 
@@ -160,8 +161,6 @@
 
 Basic.Settings.Output="Výstup"
 Basic.Settings.Output.Mode="Režim výstupu"
-Basic.Settings.Output.Mode.Simple="Jednoduchý (Stream a/alebo nahrávanie)"
-Basic.Settings.Output.Mode.Advanced="Pokročilý (Vlastný typ výstupu)"
 Basic.Settings.Output.Simple.SavePath="Cesta k FLV nahrávkam"
 Basic.Settings.Output.VideoBitrate="Bitrate videa"
 Basic.Settings.Output.AudioBitrate="Bitrate zvuku"
@@ -169,9 +168,10 @@
 Basic.Settings.Output.RetryDelay="Čas medzi pokusmi (sekundy)"
 Basic.Settings.Output.MaxRetries="Maximálny počet pokusov"
 Basic.Settings.Output.Advanced="Povoliť pokročilé nastavenia enkodéra"
-Basic.Settings.Output.CustomX264Settings="Vlastné x264 nastavenia"
 Basic.Settings.Output.UseCBR="Použiť konštantný bitrate"
 
+
+
 Basic.Settings.Video="Video"
 Basic.Settings.Video.Adapter="Video adaptér:"
 Basic.Settings.Video.BaseResolution="Základné rozlíšenie:"
@@ -186,7 +186,10 @@
 Basic.Settings.Video.InvalidResolution="Neplatné rozlíšenie. Správne je [šírka]x[výška] (napr. 1920x1080)"
 Basic.Settings.Video.CurrentlyActive="Výstup videa je práve aktívny. Prosím, vypnite všetky výstupy na zmenu nastavení videa."
 
+
 Basic.Settings.Audio="Zvuk"
 Basic.Settings.Audio.SampleRate="Vzorkovacia frekvencia"
 Basic.Settings.Audio.Channels="Kanály"
 
+
+

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/obs/data/locale/sl-SI.ini -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/obs/data/locale/sl-SI.ini Changed

@@ -27,6 +27,7 @@
 NoNameEntered.Title="Prosim vnesite veljavno ime"
 NoNameEntered.Text="Praznega imena ne morete uporabiti."
 
+
 ConfirmRemove.Title="Potrdite odstranitev"
 ConfirmRemove.Text="Ali ste prepričani, da želite odstraniti '$ 1'?"
 
@@ -169,8 +170,6 @@
 
 Basic.Settings.Output="Izhodišče"
 Basic.Settings.Output.Mode="Vrsta izhodišča"
-Basic.Settings.Output.Mode.Simple="Enostavno (Oddajanje in/ali Snemanje)"
-Basic.Settings.Output.Mode.Advanced="Napredno (vrsta izhoda po želji)"
 Basic.Settings.Output.Simple.SavePath="FLV pot snemanja"
 Basic.Settings.Output.VideoBitrate="Bitrate Videa"
 Basic.Settings.Output.AudioBitrate="Bitrate zvoka"
@@ -178,10 +177,10 @@
 Basic.Settings.Output.RetryDelay="Premor med ponovnim poskusom (sekund)"
 Basic.Settings.Output.MaxRetries="Število ponovnih poskusov"
 Basic.Settings.Output.Advanced="Omogoči napredne nastavitve kodiranja"
-Basic.Settings.Output.X264Preset="x264 prednastavitev"
-Basic.Settings.Output.CustomX264Settings="Nastavitve po meri x264"
 Basic.Settings.Output.UseCBR="Uporabi konstantni Bitrate"
 
+
+
 Basic.Settings.Video="Video"
 Basic.Settings.Video.Adapter="Grafična kartica:"
 Basic.Settings.Video.BaseResolution="Osnovna ločljivost:"
@@ -198,6 +197,7 @@
 Basic.Settings.Video.InvalidResolution="Neveljavna vrednost ločljivost. Biti mora [širina] x [višina] (npr. 1920x1080)"
 Basic.Settings.Video.CurrentlyActive="Video izhod je trenutno aktiven. Prosimo, izklopite kakšen koli izhod za spreminjanje nastavitev."
 
+
 Basic.Settings.Audio="Zvok"
 Basic.Settings.Audio.SampleRate="Sample Rate"
 Basic.Settings.Audio.Channels="Kanali"
@@ -207,3 +207,5 @@
 Basic.Settings.Audio.AuxDevice2="Mic / Dodatne Zvočne Naprave 2"
 Basic.Settings.Audio.AuxDevice3="Mic / Dodatne Zvočne Naprave 3"
 
+
+

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/obs/data/locale/sr-CS.ini -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/obs/data/locale/sr-CS.ini Changed

@@ -14,6 +14,7 @@
 MoveUp="Pomeri gore"
 MoveDown="Pomeri dole"
 Settings="Podešavanja"
+Name="Ime"
 Exit="Izlaz"
 Mixer="Mikseta"
 Browse="Pretraži"
@@ -27,6 +28,9 @@
 NoNameEntered.Title="Molim unesite ispravno ime"
 NoNameEntered.Text="Ne možete izostaviti ime."
 
+ConfirmExit.Title="Napustiti OBS?"
+ConfirmExit.Text="OBS je trenutno aktivan. Da li ste sigurni da želite izaći?"
+
 ConfirmRemove.Title="Potvrdi izbacivanje"
 ConfirmRemove.Text="Da li ste sigurni da želite izbaciti '$1'?"
 
@@ -90,6 +94,8 @@
 Basic.PropertiesWindow.AutoSelectFormat="%1 (nije podržano; automatski odabrano: %2)"
 Basic.PropertiesWindow.SelectColor="Izaberi boju"
 Basic.PropertiesWindow.SelectFont="Izaberi font"
+Basic.PropertiesWindow.ConfirmTitle="Podešavanja promenjena"
+Basic.PropertiesWindow.Confirm="Postoje podešavanja koja nisu sačuvana. Da li želite da ih sačuvate?"
 
 Basic.InteractionWindow="Interakcija sa '%1'"
 
@@ -163,6 +169,7 @@
 Basic.MainMenu.Edit.Order.MoveDown="Pomeri &dole"
 Basic.MainMenu.Edit.Order.MoveToTop="Pomeri na vrh (&T)"
 Basic.MainMenu.Edit.Order.MoveToBottom="Pomeri na dno (&B)"
+Basic.MainMenu.Edit.AdvAudio="N&apredna podešavanja zvuka"
 
 Basic.MainMenu.Help="Pomoć (&H)"
 Basic.MainMenu.Help.Logs="&Log datoteke"
@@ -182,9 +189,13 @@
 Basic.Settings.Stream.StreamType="Vrsta strima"
 
 Basic.Settings.Output="Izlaz"
+Basic.Settings.Output.Encoder="Enkoder"
+Basic.Settings.Output.SelectDirectory="Odaberi direktorijum za snimanje"
+Basic.Settings.Output.SelectFile="Odaberi datoteku za snimanje"
 Basic.Settings.Output.Mode="Režim izlaza"
-Basic.Settings.Output.Mode.Simple="Jednostavno (stream i/ili snimanje)"
-Basic.Settings.Output.Mode.Advanced="Napredno (specifičan tip izlaza)"
+Basic.Settings.Output.Mode.Simple="Jednostavno"
+Basic.Settings.Output.Mode.Adv="Napredno"
+Basic.Settings.Output.Mode.FFmpeg="FFmpeg izlaz"
 Basic.Settings.Output.Simple.SavePath="Putanja snimka za FLV"
 Basic.Settings.Output.VideoBitrate="Protok videa"
 Basic.Settings.Output.AudioBitrate="Protok zvuka"
@@ -192,9 +203,31 @@
 Basic.Settings.Output.RetryDelay="Pauza pre ponovnog pokušaja (sekunde)"
 Basic.Settings.Output.MaxRetries="Maksimalan broj ponovnih pokušaja"
 Basic.Settings.Output.Advanced="Omogući napredna podešavanja kompresora"
-Basic.Settings.Output.X264Preset="x264 šablon"
-Basic.Settings.Output.CustomX264Settings="Specifična x264 podešavanja"
+Basic.Settings.Output.EncoderPreset="Šablon enkodera (veće = manje CPU)"
+Basic.Settings.Output.CustomEncoderSettings="Prilagođena enkoder podešavanja"
 Basic.Settings.Output.UseCBR="Koristi konstantan protok"
+Basic.Settings.Output.UseBufferSize="Koristi specifičnu veličinu bafera"
+
+Basic.Settings.Output.Adv.Rescale="Skaliraj izlaz"
+Basic.Settings.Output.Adv.AudioTrack="Zvučni izvor"
+Basic.Settings.Output.Adv.Streaming="Strimovanje"
+Basic.Settings.Output.Adv.Audio.Track1="Izvor 1"
+Basic.Settings.Output.Adv.Audio.Track2="Izvor 2"
+Basic.Settings.Output.Adv.Audio.Track3="Izvor 3"
+Basic.Settings.Output.Adv.Audio.Track4="Izvor 4"
+
+Basic.Settings.Output.Adv.Recording="Snimanje"
+Basic.Settings.Output.Adv.Recording.Type="Vrsta"
+Basic.Settings.Output.Adv.Recording.Type.Standard="Uobičajeni"
+Basic.Settings.Output.Adv.Recording.Type.FFmpegOutput="Prilagođeni izlaz (FFmpeg)"
+Basic.Settings.Output.Adv.Recording.UseStreamEncoder="(Koristi strim enkoder)"
+Basic.Settings.Output.Adv.FFmpeg.SaveFilter.Common="Uobičajeni formati snimaka"
+Basic.Settings.Output.Adv.FFmpeg.SaveFilter.All="Sve datoteke"
+Basic.Settings.Output.Adv.FFmpeg.SavePathURL="Putanja datoteke ili URL"
+Basic.Settings.Output.Adv.FFmpeg.VEncoder="Video enkoder (prazno=podrazumevani)"
+Basic.Settings.Output.Adv.FFmpeg.VEncoderSettings="Podešavanja video enkodera (ako postoje)"
+Basic.Settings.Output.Adv.FFmpeg.AEncoder="Zvučni enkoder (prazno=podrazumevani)"
+Basic.Settings.Output.Adv.FFmpeg.AEncoderSettings="Podešavanja zvučnog enkodera (ako postoje)"
 
 Basic.Settings.Video="Video"
 Basic.Settings.Video.Adapter="Video adapter:"
@@ -212,6 +245,10 @@
 Basic.Settings.Video.InvalidResolution="Neispravna vrednost rezolucije. Mora biti [width]x[height] (npr. 1920x1080)"
 Basic.Settings.Video.CurrentlyActive="Video izlaz je trenutno aktivan. Molim isključite sve izlaze da promenite video podešavanja."
 
+Basic.Settings.Video.DownscaleFilter.Bilinear="Bilinear (najbrže, ali mutno pri skaliranju)"
+Basic.Settings.Video.DownscaleFilter.Bicubic="Bicubic (oštrije skaliranje, 16 uzoraka)"
+Basic.Settings.Video.DownscaleFilter.Lanczos="Lanczos (oštrije skaliranje, 32 uzorka)"
+
 Basic.Settings.Audio="Zvuk"
 Basic.Settings.Audio.SampleRate="Protok"
 Basic.Settings.Audio.Channels="Kanali"
@@ -221,3 +258,12 @@
 Basic.Settings.Audio.AuxDevice2="Mikrofon/Ulaz 2"
 Basic.Settings.Audio.AuxDevice3="Mikrofon/Ulaz 3"
 
+
+Basic.AdvAudio="Napredna podešavanja zvuka"
+Basic.AdvAudio.Name="Ime"
+Basic.AdvAudio.Volume="Glasnoća (%)"
+Basic.AdvAudio.Mono="Spoji u mono"
+Basic.AdvAudio.Panning="Pomeranje"
+Basic.AdvAudio.SyncOffset="Razlika u sinhronizaciji (ms)"
+Basic.AdvAudio.AudioTracks="Izvori"
+

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/obs/data/locale/sr-SP.ini -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/obs/data/locale/sr-SP.ini Changed

@@ -14,6 +14,7 @@
 MoveUp="Помери горе"
 MoveDown="Помери доле"
 Settings="Подешавања"
+Name="Име"
 Exit="Излаз"
 Mixer="Миксета"
 Browse="Претражи"
@@ -27,6 +28,9 @@
 NoNameEntered.Title="Молим унесите исправно име"
 NoNameEntered.Text="Не можете изоставити име."
 
+ConfirmExit.Title="Напустити OBS?"
+ConfirmExit.Text="OBS је тренутно активан. Да ли сте сигурни да желите изаћи?"
+
 ConfirmRemove.Title="Потврди избацивање"
 ConfirmRemove.Text="Да ли сте сигурни да желите избацити '$1'?"
 
@@ -90,6 +94,8 @@
 Basic.PropertiesWindow.AutoSelectFormat="%1 (није подржано; аутоматски одабрано: %2)"
 Basic.PropertiesWindow.SelectColor="Изабери боју"
 Basic.PropertiesWindow.SelectFont="Изабери фонт"
+Basic.PropertiesWindow.ConfirmTitle="Подешавања промењена"
+Basic.PropertiesWindow.Confirm="Постоје подешавања која нису сачувана. Да ли желите да их сачувате?"
 
 Basic.InteractionWindow="Интеракција са '%1'"
 
@@ -163,6 +169,7 @@
 Basic.MainMenu.Edit.Order.MoveDown="Помери доле (&D)"
 Basic.MainMenu.Edit.Order.MoveToTop="Помери на врх (&T)"
 Basic.MainMenu.Edit.Order.MoveToBottom="Помери на дно (&B)"
+Basic.MainMenu.Edit.AdvAudio="Н&апредна подешавања звука"
 
 Basic.MainMenu.Help="Помоћ (&H)"
 Basic.MainMenu.Help.Logs="Лог датотеке (&L)"
@@ -182,9 +189,13 @@
 Basic.Settings.Stream.StreamType="Врста стрима"
 
 Basic.Settings.Output="Излаз"
+Basic.Settings.Output.Encoder="Енкодер"
+Basic.Settings.Output.SelectDirectory="Одабери директоријум за снимање"
+Basic.Settings.Output.SelectFile="Одабери датотеку за снимање"
 Basic.Settings.Output.Mode="Режим излаза"
-Basic.Settings.Output.Mode.Simple="Једноставно (стрим и/или снимање)"
-Basic.Settings.Output.Mode.Advanced="Напредно (специфичан тип излаза)"
+Basic.Settings.Output.Mode.Simple="Једноставно"
+Basic.Settings.Output.Mode.Adv="Напредно"
+Basic.Settings.Output.Mode.FFmpeg="FFmpeg излаз"
 Basic.Settings.Output.Simple.SavePath="Путања снимка за FLV"
 Basic.Settings.Output.VideoBitrate="Проток видеа"
 Basic.Settings.Output.AudioBitrate="Проток звука"
@@ -192,9 +203,31 @@
 Basic.Settings.Output.RetryDelay="Пауза пре поновног покушаја (секунде)"
 Basic.Settings.Output.MaxRetries="Максималан број поновних покушаја"
 Basic.Settings.Output.Advanced="Омогући напредна подешавања компресора"
-Basic.Settings.Output.X264Preset="x264 шаблон"
-Basic.Settings.Output.CustomX264Settings="Специфична x264 подешавања"
+Basic.Settings.Output.EncoderPreset="Шаблон енкодера (веће = мање CPU-а)"
+Basic.Settings.Output.CustomEncoderSettings="Прилагођена енкодер подешавања"
 Basic.Settings.Output.UseCBR="Користи константан проток"
+Basic.Settings.Output.UseBufferSize="Користи специфичну величину бафера"
+
+Basic.Settings.Output.Adv.Rescale="Скалирај излаз"
+Basic.Settings.Output.Adv.AudioTrack="Звучни извор"
+Basic.Settings.Output.Adv.Streaming="Стримовање"
+Basic.Settings.Output.Adv.Audio.Track1="Извор 1"
+Basic.Settings.Output.Adv.Audio.Track2="Извор 2"
+Basic.Settings.Output.Adv.Audio.Track3="Извор 3"
+Basic.Settings.Output.Adv.Audio.Track4="Извор 4"
+
+Basic.Settings.Output.Adv.Recording="Снимање"
+Basic.Settings.Output.Adv.Recording.Type="Врста"
+Basic.Settings.Output.Adv.Recording.Type.Standard="Уобичајени"
+Basic.Settings.Output.Adv.Recording.Type.FFmpegOutput="Прилагођени излаз (FFmpeg)"
+Basic.Settings.Output.Adv.Recording.UseStreamEncoder="(Користи стрим енкодер)"
+Basic.Settings.Output.Adv.FFmpeg.SaveFilter.Common="Уобичајени формати снимака"
+Basic.Settings.Output.Adv.FFmpeg.SaveFilter.All="Све датотеке"
+Basic.Settings.Output.Adv.FFmpeg.SavePathURL="Путања датотеке или URL"
+Basic.Settings.Output.Adv.FFmpeg.VEncoder="Видео енкодер (празно=подразумевани)"
+Basic.Settings.Output.Adv.FFmpeg.VEncoderSettings="Подешавања видео енкодера (ако постоје)"
+Basic.Settings.Output.Adv.FFmpeg.AEncoder="Звучни енкодер (празно=подразумевани)"
+Basic.Settings.Output.Adv.FFmpeg.AEncoderSettings="Подешавања звучног енкодера (ако постоје)"
 
 Basic.Settings.Video="Видео"
 Basic.Settings.Video.Adapter="Видео адаптер:"
@@ -212,6 +245,10 @@
 Basic.Settings.Video.InvalidResolution="Неисправна вредност резолуције. Мора бити [width]x[height] (нпр. 1920x1080)"
 Basic.Settings.Video.CurrentlyActive="Видео излаз је тренутно активан. Молим искључите све излазе да промените видео подешавања."
 
+Basic.Settings.Video.DownscaleFilter.Bilinear="Bilinear (најбрже, али мутно при скалирању)"
+Basic.Settings.Video.DownscaleFilter.Bicubic="Bicubic (оштрије скалирање, 16 узорака)"
+Basic.Settings.Video.DownscaleFilter.Lanczos="Lanczos (оштрије скалирање, 32 узорка)"
+
 Basic.Settings.Audio="Звук"
 Basic.Settings.Audio.SampleRate="Проток"
 Basic.Settings.Audio.Channels="Канали"
@@ -221,3 +258,12 @@
 Basic.Settings.Audio.AuxDevice2="Микрофон/Улаз 2"
 Basic.Settings.Audio.AuxDevice3="Микрофон/Улаз 3"
 
+
+Basic.AdvAudio="Напредна подешавања звука"
+Basic.AdvAudio.Name="Име"
+Basic.AdvAudio.Volume="Гласноћа (%)"
+Basic.AdvAudio.Mono="Споји у моно"
+Basic.AdvAudio.Panning="Померање"
+Basic.AdvAudio.SyncOffset="Разлика у синхронизацији (ms)"
+Basic.AdvAudio.AudioTracks="Извори"
+

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/obs/data/locale/sv-SE.ini -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/obs/data/locale/sv-SE.ini Changed

@@ -5,6 +5,8 @@
 OK="OK"
 Apply="Bekräfta"
 Cancel="Avbryt"
+Save="Spara"
+Discard="Radera"
 Yes="Ja"
 No="Nej"
 Add="Lägg till"
@@ -14,6 +16,7 @@
 MoveUp="Flytta upp"
 MoveDown="Flytta ned"
 Settings="Inställningar"
+Name="Namn"
 Exit="Avsluta"
 Mixer="Mixer"
 Browse="Bläddra"
@@ -27,6 +30,9 @@
 NoNameEntered.Title="Vänligen ange ett giltigt namn"
 NoNameEntered.Text="Du måste ange ett namn."
 
+ConfirmExit.Title="Avsluta OBS?"
+ConfirmExit.Text="OBS är aktivt just nu.  Är du säker på att du vill avsluta?"
+
 ConfirmRemove.Title="Bekräfta borttagning"
 ConfirmRemove.Text="Vill du verkligen ta bort '$1'?"
 
@@ -90,6 +96,8 @@
 Basic.PropertiesWindow.AutoSelectFormat="%1 (stöds inte, Välj automatiskt: %2)"
 Basic.PropertiesWindow.SelectColor="Välj färg"
 Basic.PropertiesWindow.SelectFont="Välj typsnitt"
+Basic.PropertiesWindow.ConfirmTitle="Inställningarna har ändrats"
+Basic.PropertiesWindow.Confirm="Det finns osparade ändringar.  Vill du behålla dem?"
 
 Basic.InteractionWindow="Interagerar med '%1'"
 
@@ -163,6 +171,7 @@
 Basic.MainMenu.Edit.Order.MoveDown="Flytta &ned"
 Basic.MainMenu.Edit.Order.MoveToTop="Lägg &överst"
 Basic.MainMenu.Edit.Order.MoveToBottom="Lägg unders&t"
+Basic.MainMenu.Edit.AdvAudio="&Avancerade ljudinställningar"
 
 Basic.MainMenu.Help="&Hjälp"
 Basic.MainMenu.Help.Logs="&Loggfiler"
@@ -182,9 +191,13 @@
 Basic.Settings.Stream.StreamType="Streamtyp"
 
 Basic.Settings.Output="Utmatning"
+Basic.Settings.Output.Encoder="Kodare"
+Basic.Settings.Output.SelectDirectory="Välj inspelningsplats"
+Basic.Settings.Output.SelectFile="Välj inspelningsfil"
 Basic.Settings.Output.Mode="Utmatningsläge"
-Basic.Settings.Output.Mode.Simple="Enkelt (streama och/eller spela in)"
-Basic.Settings.Output.Mode.Advanced="Avancerat (anpassad utmatningstyp)"
+Basic.Settings.Output.Mode.Simple="Simpel"
+Basic.Settings.Output.Mode.Adv="Avancerat"
+Basic.Settings.Output.Mode.FFmpeg="FFmpeg-utmatning"
 Basic.Settings.Output.Simple.SavePath="Sökväg till FLV-inspelningsfil"
 Basic.Settings.Output.VideoBitrate="Bithastighet för video"
 Basic.Settings.Output.AudioBitrate="Bithastighet för ljud"
@@ -192,9 +205,32 @@
 Basic.Settings.Output.RetryDelay="Återanslutningsfördröjning (sek)"
 Basic.Settings.Output.MaxRetries="Maximalt antal försök"
 Basic.Settings.Output.Advanced="Aktivera avancerade kodarinställningar"
-Basic.Settings.Output.X264Preset="x264-förinställning"
-Basic.Settings.Output.CustomX264Settings="Anpassade x264 inställningar"
+Basic.Settings.Output.EncoderPreset="Kodarförinställning (högre = mindre CPU)"
+Basic.Settings.Output.CustomEncoderSettings="Inställningar för anpassade kodare"
 Basic.Settings.Output.UseCBR="Använd konstant bithastighet"
+Basic.Settings.Output.UseBufferSize="Använd anpassad buffertstorlek"
+
+Basic.Settings.Output.Adv.Rescale="Skala om utmatning"
+Basic.Settings.Output.Adv.AudioTrack="Ljudspår"
+Basic.Settings.Output.Adv.Streaming="Strömning"
+Basic.Settings.Output.Adv.ApplyServiceSettings="Tillämpa strömningstjänstens kodarinställningar"
+Basic.Settings.Output.Adv.Audio.Track1="Spår 1"
+Basic.Settings.Output.Adv.Audio.Track2="Spår 2"
+Basic.Settings.Output.Adv.Audio.Track3="Spår 3"
+Basic.Settings.Output.Adv.Audio.Track4="Spår 4"
+
+Basic.Settings.Output.Adv.Recording="Inspelning"
+Basic.Settings.Output.Adv.Recording.Type="Typ"
+Basic.Settings.Output.Adv.Recording.Type.Standard="Standard"
+Basic.Settings.Output.Adv.Recording.Type.FFmpegOutput="Anpassad utmatning (FFmpeg)"
+Basic.Settings.Output.Adv.Recording.UseStreamEncoder="(Använd strömkodare)"
+Basic.Settings.Output.Adv.FFmpeg.SaveFilter.Common="Vanliga inspelningsformat"
+Basic.Settings.Output.Adv.FFmpeg.SaveFilter.All="Alla Filer"
+Basic.Settings.Output.Adv.FFmpeg.SavePathURL="Sökväg eller webbadress"
+Basic.Settings.Output.Adv.FFmpeg.VEncoder="Videokodare (tomt = standard)"
+Basic.Settings.Output.Adv.FFmpeg.VEncoderSettings="Videokodar-inställningar (om något)"
+Basic.Settings.Output.Adv.FFmpeg.AEncoder="Ljudkodare (tomt = standard)"
+Basic.Settings.Output.Adv.FFmpeg.AEncoderSettings="Ljudkodar-inställningar (om något)"
 
 Basic.Settings.Video="Video"
 Basic.Settings.Video.Adapter="Grafikkort:"
@@ -212,6 +248,10 @@
 Basic.Settings.Video.InvalidResolution="Ogiltig upplösning. Måste anges som [bredd]x[höjd] (t.ex 1920x1080)"
 Basic.Settings.Video.CurrentlyActive="Videoutmatning är aktiv. Stoppa alla utmatningar för att kunna ändra videoinställningar."
 
+Basic.Settings.Video.DownscaleFilter.Bilinear="Bilinjär (snabbast, men suddigt om skalad)"
+Basic.Settings.Video.DownscaleFilter.Bicubic="Bikubisk (Vässd skalning, 16 prover)"
+Basic.Settings.Video.DownscaleFilter.Lanczos="Lanczos (Vässd skalning, 32 prover)"
+
 Basic.Settings.Audio="Ljud"
 Basic.Settings.Audio.SampleRate="Samplingsfrekvens"
 Basic.Settings.Audio.Channels="Kanaler"
@@ -221,3 +261,12 @@
 Basic.Settings.Audio.AuxDevice2="Mikrofon/extra ljudenhet 2"
 Basic.Settings.Audio.AuxDevice3="Mikrofon/extra ljudenhet 3"
 
+
+Basic.AdvAudio="Avancerade ljudinställningar"
+Basic.AdvAudio.Name="Namn"
+Basic.AdvAudio.Volume="Volym (%)"
+Basic.AdvAudio.Mono="Downmixa till Mono"
+Basic.AdvAudio.Panning="Panorering"
+Basic.AdvAudio.SyncOffset="Sync Offset (ms)"
+Basic.AdvAudio.AudioTracks="Spår"
+

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/obs/data/locale/th-TH.ini -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/obs/data/locale/th-TH.ini Changed

@@ -1,5 +1,6 @@
 
 Language="ไทย"
+Region="ประเทศไทย"
 
 OK="ตกลง"
 Apply="นำไปใช้"
@@ -13,15 +14,18 @@
 MoveUp="เลื่อนขึ้น"
 MoveDown="เลื่อนลง"
 Settings="ตั้งค่า"
+Exit="ออก"
 Browse="เปิดหา"
 Mono="โมโน"
 Stereo="สเตอริโอ"
 
 
 
+
 ConfirmRemove.Title="ยืนยันการลบ"
 ConfirmRemove.Text="คุณแน่ใจแล้วหรือที่จะลบ '$1'?"
 
+Output.ConnectFail.Title="ไม่สามารถเชื่อมต่อได้"
 Output.ConnectFail.ConnectFailed="ไม่สามารถเชื่อมต่อกับเซิร์ฟเวอร์"
 Output.ConnectFail.Disconnected="ถูกตัดออกจากเซิร์ฟเวอร์"
 
@@ -41,6 +45,7 @@
 
 Basic.Main.DefaultSceneName.Text="ฉาก %1"
 
+Basic.SourceSelect.CreateNew="สร้างใหม่"
 
 
 
@@ -48,6 +53,10 @@
 Basic.TransformWindow.Position="ตำแหน่ง"
 Basic.TransformWindow.Size="ขนาด"
 
+Basic.TransformWindow.Alignment.TopLeft="ด้านบนซ้าย"
+Basic.TransformWindow.Alignment.TopCenter="ด้านบนกลาง"
+Basic.TransformWindow.Alignment.TopRight="ด้านบนขวา"
+Basic.TransformWindow.Alignment.BottomLeft="ด้านล่างซ้าย"
 
 
 
@@ -58,6 +67,7 @@
 Basic.Main.StopRecording="หยุดบันทึก"
 Basic.Main.StopStreaming="หยุดสตรีมมิ่ง"
 
+Basic.MainMenu.File.Exit="อ&อก"
 
 
 Basic.MainMenu.Help.CheckForUpdates="ตรวจสอบการอัพเดต"
@@ -70,11 +80,15 @@
 Basic.Settings.Stream="สตรีม"
 Basic.Settings.Stream.StreamType="รูปแบบการสตรีม"
 
-Basic.Settings.Output.Mode.Simple="อย่างง่าย (สตรีม และ/หรือ บันทึก)"
+
+
 
 Basic.Settings.Video="วีดีโอ"
 Basic.Settings.Video.DisableAeroWindows="ปิดการใช้งาน Aero (เฉพาะ Windows เท่านั้น)"
 Basic.Settings.Video.FPS="FPS:"
 
+
 Basic.Settings.Audio="เสียง"
 
+
+

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/obs/data/locale/tr-TR.ini -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/obs/data/locale/tr-TR.ini Changed

@@ -27,6 +27,7 @@
 NoNameEntered.Title="Lütfen geçerli bir ad girin"
 NoNameEntered.Text="İsim boş olamaz."
 
+
 ConfirmRemove.Title="Kaldırmayı Onayla"
 ConfirmRemove.Text="'$1''i kaldırmak istediğinizden emin misiniz?"
 
@@ -154,18 +155,16 @@
 
 Basic.Settings.Output="Çıkış"
 Basic.Settings.Output.Mode="Çıkış modu"
-Basic.Settings.Output.Mode.Simple="Basit (Yayın ve/veya kayıt)"
-Basic.Settings.Output.Mode.Advanced="Gelişmiş (Özel çıkış tipi)"
 Basic.Settings.Output.Simple.SavePath="FLV Kayıt Dizini"
 Basic.Settings.Output.VideoBitrate="Video Bithızı"
 Basic.Settings.Output.AudioBitrate="Ses Bithızı"
 Basic.Settings.Output.Reconnect="Otomatik Yeniden Bağlan"
 Basic.Settings.Output.RetryDelay="Yeniden Deneme Gecikmesi (saniye)"
 Basic.Settings.Output.MaxRetries="En fazla yeniden deneme sayısı"
-Basic.Settings.Output.X264Preset="x264 Hazır Ayarı"
-Basic.Settings.Output.CustomX264Settings="Özel x264 Ayarı"
 Basic.Settings.Output.UseCBR="Sabit Bit Hızı Kullanın"
 
+
+
 Basic.Settings.Video="Video"
 Basic.Settings.Video.Adapter="Video Bağdaştırıcısi:"
 Basic.Settings.Video.BaseResolution="Temel Çözünürlük:"
@@ -181,6 +180,7 @@
 Basic.Settings.Video.InvalidResolution="Geçersiz çözünürlük değeri. [Genişlik]x[Yükseklik] şeklinde olmalıdır. (örnek 1920x1080)"
 Basic.Settings.Video.CurrentlyActive="Video çıkışı şu anda etkin durumda.  Video ayarlarını değiştirmek için lütfen bütün çıkışları kapalı duruma getirin."
 
+
 Basic.Settings.Audio="Ses"
 Basic.Settings.Audio.SampleRate="Örnekleme Sıklığı"
 Basic.Settings.Audio.Channels="Kanallar"
@@ -190,3 +190,5 @@
 Basic.Settings.Audio.AuxDevice2="Mic/yardımcı ses aygıtı 2"
 Basic.Settings.Audio.AuxDevice3="Mic/yardımcı ses aygıtı 3"
 
+
+

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/obs/data/locale/uk-UA.ini -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/obs/data/locale/uk-UA.ini Changed

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/obs/data/locale/zh-CN.ini -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/obs/data/locale/zh-CN.ini Changed

@@ -5,6 +5,8 @@
 OK="确定"
 Apply="应用"
 Cancel="取消"
+Save="保存"
+Discard="舍弃"
 Yes="是"
 No="否"
 Add="添加"
@@ -14,6 +16,7 @@
 MoveUp="上移"
 MoveDown="下移"
 Settings="设置"
+Name="名称"
 Exit="退出"
 Mixer="混音器"
 Browse="浏览"
@@ -24,14 +27,19 @@
 NameExists.Title="名称已存在"
 NameExists.Text="该名称已被使用"
 
+NoNameEntered.Title="请输入一个有效的名称"
 NoNameEntered.Text="您不能使用空白名称。"
 
+ConfirmExit.Title="退出OBS?"
+ConfirmExit.Text="OBS当前是活跃的. 你确定要退出吗?"
+
 ConfirmRemove.Title="确认移除"
 ConfirmRemove.Text="确实要删除 '$1' 吗？"
 
 Output.ConnectFail.Title="连接失败"
 Output.ConnectFail.BadPath="无效的路径或URL。请检查您的设置以确认它们是有效的。"
 Output.ConnectFail.ConnectFailed="无法连接到服务器"
+Output.ConnectFail.InvalidStream="无法访问指定的通道或流密钥. 这可能是因为 密钥/通道 是无效的, 活着因为服务认为你已经登录了."
 Output.ConnectFail.Error="试图连接到服务器时出现意外的错误。详细信息记录在日志文件中。"
 Output.ConnectFail.Disconnected="已从服务器断开。"
 
@@ -48,6 +56,19 @@
 LicenseAgreement.IAgree="我同意"
 LicenseAgreement.Exit="退出"
 
+Remux.SourceFile="OBS 录像"
+Remux.TargetFile="目标文件"
+Remux.Remux="重新封装"
+Remux.RecordingPattern="OBS 录像(*.flv)"
+Remux.FinishedTitle="转封装完成"
+Remux.Finished="录像已经转封装"
+Remux.FinishedError="录像已经转封装, 但是文件可能不完整."
+Remux.SelectRecording="选择OBS录像 ..."
+Remux.SelectTarget="选择目标文件 ..."
+Remux.FileExistsTitle="目标文件已存在"
+Remux.FileExists="目标文件存在，你想要替换它吗?"
+Remux.ExitUnfinishedTitle="转封装在进行中"
+Remux.ExitUnfinished="转封装没有完成, 现在停止可能使目标文件不可用.\n你确定要停止转封装吗?"
 
 UpdateAvailable="版本升级"
 UpdateAvailable.Text="新的版本 %1.%2.%3 已可用。<a href='%4'> 点击这里下载</a>"
@@ -72,8 +93,13 @@
 Basic.SourceSelect.AddExisting="添加现有"
 
 Basic.PropertiesWindow="属性 '%1'"
+Basic.PropertiesWindow.AutoSelectFormat="%1 (不支持; 自动选择: %2)"
 Basic.PropertiesWindow.SelectColor="选择颜色"
+Basic.PropertiesWindow.SelectFont="选择字体"
+Basic.PropertiesWindow.ConfirmTitle="设置已更改"
+Basic.PropertiesWindow.Confirm="有未保存的更改. 你想要保存他们吗？"
 
+Basic.InteractionWindow="与'%1'交互"
 
 Basic.StatusBar.Reconnecting="已断开连接，正在重连（尝试 %1）"
 Basic.StatusBar.ReconnectSuccessful="重连成功"
@@ -119,6 +145,8 @@
 Basic.MainMenu.File="& 文件"
 Basic.MainMenu.File.Export="& 导出"
 Basic.MainMenu.File.Import="& 导入"
+Basic.MainMenu.File.ShowRecordings="显示 & 录像"
+Basic.MainMenu.File.Remux="转&封装 录像"
 Basic.MainMenu.File.Settings="& 设置"
 Basic.MainMenu.File.Exit="退出(&X)"
 
@@ -143,9 +171,11 @@
 Basic.MainMenu.Edit.Order.MoveDown="下移"
 Basic.MainMenu.Edit.Order.MoveToTop="移至顶部"
 Basic.MainMenu.Edit.Order.MoveToBottom="移至底部"
+Basic.MainMenu.Edit.AdvAudio="&高级音频属性"
 
 Basic.MainMenu.Help="& 帮助"
 Basic.MainMenu.Help.Logs="& 日志文件"
+Basic.MainMenu.Help.Logs.ShowLogs="& 显示日志文件"
 Basic.MainMenu.Help.Logs.UploadCurrentLog="& 上传当前日志文件"
 Basic.MainMenu.Help.Logs.UploadLastLog="& 上传最后一个日志文件"
 Basic.MainMenu.Help.CheckForUpdates="检查升级"
@@ -161,29 +191,67 @@
 Basic.Settings.Stream.StreamType="串流类型"
 
 Basic.Settings.Output="输出"
+Basic.Settings.Output.Encoder="编码器"
+Basic.Settings.Output.SelectDirectory="选择录像目录"
+Basic.Settings.Output.SelectFile="选择录像文件"
 Basic.Settings.Output.Mode="输出模式"
-Basic.Settings.Output.Mode.Simple="简单 (串流和录制)"
-Basic.Settings.Output.Mode.Advanced="高级 (自定义输出类型)"
+Basic.Settings.Output.Mode.Simple="简单"
+Basic.Settings.Output.Mode.Adv="高级"
+Basic.Settings.Output.Mode.FFmpeg="FFmpeg 输出"
 Basic.Settings.Output.Simple.SavePath="FLV 录制路径"
 Basic.Settings.Output.VideoBitrate="视频比特率"
 Basic.Settings.Output.AudioBitrate="音频比特率"
 Basic.Settings.Output.Reconnect="自动重连"
 Basic.Settings.Output.RetryDelay="重试延迟时间 (秒)"
 Basic.Settings.Output.MaxRetries="最大重试次数"
+Basic.Settings.Output.Advanced="启用高级编码器设置"
+Basic.Settings.Output.EncoderPreset="编码器预设 (更高 = 较少的CPU占用)"
+Basic.Settings.Output.CustomEncoderSettings="自定义编码器设置"
+Basic.Settings.Output.UseCBR="使用恒定比特率"
+Basic.Settings.Output.UseBufferSize="使用自定义缓存大小"
+
+Basic.Settings.Output.Adv.Rescale="重新缩放输出"
+Basic.Settings.Output.Adv.AudioTrack="音轨"
+Basic.Settings.Output.Adv.Streaming="流"
+Basic.Settings.Output.Adv.ApplyServiceSettings="强制流服务编码器设置"
+Basic.Settings.Output.Adv.Audio.Track1="轨道 1"
+Basic.Settings.Output.Adv.Audio.Track2="轨道 2"
+Basic.Settings.Output.Adv.Audio.Track3="轨道 3"
+Basic.Settings.Output.Adv.Audio.Track4="轨道 4"
+
+Basic.Settings.Output.Adv.Recording="录像"
+Basic.Settings.Output.Adv.Recording.Type="类型"
+Basic.Settings.Output.Adv.Recording.Type.Standard="标准"
+Basic.Settings.Output.Adv.Recording.Type.FFmpegOutput="自定义输出 (FFmpeg)"
+Basic.Settings.Output.Adv.Recording.UseStreamEncoder="(使用流编码器)"
+Basic.Settings.Output.Adv.FFmpeg.SaveFilter.Common="常见的录像格式"
+Basic.Settings.Output.Adv.FFmpeg.SaveFilter.All="所有文件"
+Basic.Settings.Output.Adv.FFmpeg.SavePathURL="文件路径或 URL"
+Basic.Settings.Output.Adv.FFmpeg.VEncoder="视频编码器 (空白 = 默认值)"
+Basic.Settings.Output.Adv.FFmpeg.VEncoderSettings="视频编码器设置 (如果有)"
+Basic.Settings.Output.Adv.FFmpeg.AEncoder="音频编码器 (空白 = 默认值)"
+Basic.Settings.Output.Adv.FFmpeg.AEncoderSettings="视频编码器设置 (如果有)"
 
 Basic.Settings.Video="视频"
 Basic.Settings.Video.Adapter="视频适配器："
 Basic.Settings.Video.BaseResolution="基本分辨率："
+Basic.Settings.Video.ScaledResolution="缩放分辨率"
+Basic.Settings.Video.DownscaleFilter="缩放过滤器"
 Basic.Settings.Video.DisableAeroWindows="禁用 Aero （仅限 Windows）"
 Basic.Settings.Video.FPS="每秒帧数:"
 Basic.Settings.Video.FPSCommon="常见的 FPS 值"
 Basic.Settings.Video.FPSInteger="整数 FPS 值"
+Basic.Settings.Video.FPSFraction="分数帧率值"
 Basic.Settings.Video.Numerator="分子："
 Basic.Settings.Video.Denominator="分母："
 Basic.Settings.Video.Renderer="渲染器："
 Basic.Settings.Video.InvalidResolution="无效的分辨率值。必须是 [宽]x[高] (如 1920 x 1080)"
 Basic.Settings.Video.CurrentlyActive="视频输出处于活动状态。请关闭任何输出以更改视频设置。"
 
+Basic.Settings.Video.DownscaleFilter.Bilinear="双直线法(最快, 但如果缩放会模糊)"
+Basic.Settings.Video.DownscaleFilter.Bicubic="两次立方(削尖缩放, 16 个样本)"
+Basic.Settings.Video.DownscaleFilter.Lanczos="Lanczos(削尖缩放, 32个样本)"
+
 Basic.Settings.Audio="音频"
 Basic.Settings.Audio.SampleRate="采样率"
 Basic.Settings.Audio.Channels="声道"
@@ -193,3 +261,19 @@
 Basic.Settings.Audio.AuxDevice2="麦克风/辅助音频设备 2"
 Basic.Settings.Audio.AuxDevice3="麦克风/辅助音频设备 3"
 
+Basic.Settings.Advanced="高级"
+Basic.Settings.Advanced.Audio.BufferingTime="音频缓冲时间"
+Basic.Settings.Advanced.Video.ColorFormat="颜色格式"
+Basic.Settings.Advanced.Video.ColorSpace="YUV 颜色空间"
+Basic.Settings.Advanced.Video.ColorRange="YUV 颜色范围"
+Basic.Settings.Advanced.Video.ColorRange.Partial="局部"
+Basic.Settings.Advanced.Video.ColorRange.Full="全部"
+
+Basic.AdvAudio="高级音频属性"
+Basic.AdvAudio.Name="名称"
+Basic.AdvAudio.Volume="卷 (%)"
+Basic.AdvAudio.Mono="下降混合为单声道"
+Basic.AdvAudio.Panning="平移"
+Basic.AdvAudio.SyncOffset="同步偏移 (毫秒)"
+Basic.AdvAudio.AudioTracks="轨道"
+

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/obs/data/locale/zh-TW.ini -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/obs/data/locale/zh-TW.ini Changed

@@ -27,6 +27,7 @@
 NoNameEntered.Title="請輸入有效的名稱"
 NoNameEntered.Text="您使用的名稱不能為空。"
 
+
 ConfirmRemove.Title="確認刪除？"
 ConfirmRemove.Text="您確定要刪除「$1」？"
 
@@ -167,8 +168,6 @@
 
 Basic.Settings.Output="輸出"
 Basic.Settings.Output.Mode="輸出模式"
-Basic.Settings.Output.Mode.Simple="簡易（串流/錄製）"
-Basic.Settings.Output.Mode.Advanced="進階（自訂輸出模式）"
 Basic.Settings.Output.Simple.SavePath="錄製 FLV 路徑"
 Basic.Settings.Output.VideoBitrate="影像頻率（kbit/s）"
 Basic.Settings.Output.AudioBitrate="音效頻率（kbit/s）"
@@ -176,8 +175,8 @@
 Basic.Settings.Output.RetryDelay="重試間隔（秒）"
 Basic.Settings.Output.MaxRetries="最大嘗試次數"
 Basic.Settings.Output.Advanced="啓用進階編碼器設定"
-Basic.Settings.Output.X264Preset="x264 預設"
-Basic.Settings.Output.CustomX264Settings="自訂 x264 設定"
+
+
 
 Basic.Settings.Video="影像"
 Basic.Settings.Video.Adapter="顯示卡："
@@ -195,6 +194,7 @@
 Basic.Settings.Video.InvalidResolution="無效的解析度。 必須表達為 [寬]x[高] (例如：1920x1080)"
 Basic.Settings.Video.CurrentlyActive="目前影像輸出進行中。 請先停止輸出以便修改影像設定。"
 
+
 Basic.Settings.Audio="音效"
 Basic.Settings.Audio.SampleRate="取樣頻率"
 Basic.Settings.Audio.Channels="通道數"
@@ -204,3 +204,5 @@
 Basic.Settings.Audio.AuxDevice2="麥克風/輸入音效 2"
 Basic.Settings.Audio.AuxDevice3="麥克風/輸入音效 3"
 
+
+

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/obs/forms/OBSBasic.ui -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/obs/forms/OBSBasic.ui Changed

@@ -30,6 +30,9 @@
    <iconset resource="obs.qrc">
     <normaloff>:/res/images/obs.png</normaloff>:/res/images/obs.png</iconset>
   </property>
+  <property name="styleSheet">
+   <string notr="true"/>
+  </property>
   <widget class="QWidget" name="centralwidget">
    <layout class="QVBoxLayout" name="verticalLayout">
     <item>
@@ -69,10 +72,10 @@
       <property name="maximumSize">
        <size>
         <width>16777215</width>
-        <height>154</height>
+        <height>165</height>
        </size>
       </property>
-      <layout class="QHBoxLayout" name="horizontalLayout_2">
+      <layout class="QGridLayout" name="gridLayout">
        <property name="leftMargin">
         <number>0</number>
        </property>
@@ -85,7 +88,173 @@
        <property name="bottomMargin">
         <number>0</number>
        </property>
-       <item>
+       <property name="verticalSpacing">
+        <number>2</number>
+       </property>
+       <item row="0" column="2">
+        <widget class="QWidget" name="widget_6" native="true">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Maximum" vsizetype="Maximum">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <layout class="QHBoxLayout" name="horizontalLayout">
+          <property name="spacing">
+           <number>4</number>
+          </property>
+          <property name="leftMargin">
+           <number>0</number>
+          </property>
+          <property name="topMargin">
+           <number>0</number>
+          </property>
+          <property name="rightMargin">
+           <number>0</number>
+          </property>
+          <property name="bottomMargin">
+           <number>0</number>
+          </property>
+          <item>
+           <widget class="QLabel" name="label_3">
+            <property name="sizePolicy">
+             <sizepolicy hsizetype="Maximum" vsizetype="Preferred">
+              <horstretch>0</horstretch>
+              <verstretch>0</verstretch>
+             </sizepolicy>
+            </property>
+            <property name="text">
+             <string>Mixer</string>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <widget class="QPushButton" name="advAudioProps">
+            <property name="sizePolicy">
+             <sizepolicy hsizetype="Maximum" vsizetype="Maximum">
+              <horstretch>0</horstretch>
+              <verstretch>0</verstretch>
+             </sizepolicy>
+            </property>
+            <property name="maximumSize">
+             <size>
+              <width>22</width>
+              <height>22</height>
+             </size>
+            </property>
+            <property name="text">
+             <string notr="true"/>
+            </property>
+            <property name="icon">
+             <iconset resource="obs.qrc">
+              <normaloff>:/res/images/configuration21_16.png</normaloff>:/res/images/configuration21_16.png</iconset>
+            </property>
+            <property name="flat">
+             <bool>true</bool>
+            </property>
+           </widget>
+          </item>
+         </layout>
+        </widget>
+       </item>
+       <item row="1" column="2">
+        <widget class="QWidget" name="widget_4" native="true">
+         <layout class="QVBoxLayout" name="verticalLayout_9">
+          <property name="leftMargin">
+           <number>0</number>
+          </property>
+          <property name="topMargin">
+           <number>0</number>
+          </property>
+          <property name="rightMargin">
+           <number>0</number>
+          </property>
+          <property name="bottomMargin">
+           <number>0</number>
+          </property>
+          <item>
+           <widget class="QFrame" name="frame_4">
+            <property name="sizePolicy">
+             <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
+              <horstretch>0</horstretch>
+              <verstretch>0</verstretch>
+             </sizepolicy>
+            </property>
+            <property name="frameShape">
+             <enum>QFrame::StyledPanel</enum>
+            </property>
+            <property name="frameShadow">
+             <enum>QFrame::Raised</enum>
+            </property>
+            <layout class="QVBoxLayout" name="verticalLayout_7">
+             <property name="spacing">
+              <number>0</number>
+             </property>
+             <property name="leftMargin">
+              <number>0</number>
+             </property>
+             <property name="topMargin">
+              <number>0</number>
+             </property>
+             <property name="rightMargin">
+              <number>0</number>
+             </property>
+             <property name="bottomMargin">
+              <number>0</number>
+             </property>
+             <item>
+              <widget class="VScrollArea" name="scrollArea">
+               <property name="verticalScrollBarPolicy">
+                <enum>Qt::ScrollBarAlwaysOn</enum>
+               </property>
+               <property name="horizontalScrollBarPolicy">
+                <enum>Qt::ScrollBarAlwaysOff</enum>
+               </property>
+               <property name="widgetResizable">
+                <bool>true</bool>
+               </property>
+               <widget class="QWidget" name="volumeWidgets">
+                <property name="geometry">
+                 <rect>
+                  <x>0</x>
+                  <y>0</y>
+                  <width>231</width>
+                  <height>16</height>
+                 </rect>
+                </property>
+                <property name="sizePolicy">
+                 <sizepolicy hsizetype="Preferred" vsizetype="Maximum">
+                  <horstretch>0</horstretch>
+                  <verstretch>0</verstretch>
+                 </sizepolicy>
+                </property>
+                <layout class="QVBoxLayout" name="verticalLayout_6">
+                 <property name="spacing">
+                  <number>0</number>
+                 </property>
+                 <property name="leftMargin">
+                  <number>0</number>
+                 </property>
+                 <property name="topMargin">
+                  <number>0</number>
+                 </property>
+                 <property name="rightMargin">
+                  <number>0</number>
+                 </property>
+                 <property name="bottomMargin">
+                  <number>0</number>
+                 </property>
+                </layout>
+               </widget>
+              </widget>
+             </item>
+            </layout>
+           </widget>
+          </item>
+         </layout>
+        </widget>
+       </item>
+       <item row="1" column="0">
         <widget class="QWidget" name="widget_5" native="true">
          <property name="sizePolicy">
           <sizepolicy hsizetype="Maximum" vsizetype="Preferred">
@@ -113,13 +282,6 @@
            <number>0</number>

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/obs/forms/OBSBasicSettings.ui -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/obs/forms/OBSBasicSettings.ui Changed

@@ -87,6 +87,15 @@
           <normaloff>:/settings/images/settings/video-display-3.png</normaloff>:/settings/images/settings/video-display-3.png</iconset>
         </property>
        </item>
+       <item>
+        <property name="text">
+         <string>Basic.Settings.Advanced</string>
+        </property>
+        <property name="icon">
+         <iconset resource="obs.qrc">
+          <normaloff>:/settings/images/settings/advanced.png</normaloff>:/settings/images/settings/advanced.png</iconset>
+        </property>
+       </item>
       </widget>
      </item>
      <item>
@@ -115,9 +124,6 @@
            </property>
           </spacer>
          </item>
-         <item row="1" column="1">
-          <widget class="QComboBox" name="language"/>
-         </item>
          <item row="1" column="0">
           <widget class="QLabel" name="label">
            <property name="minimumSize">
@@ -134,6 +140,9 @@
            </property>
           </widget>
          </item>
+         <item row="1" column="1">
+          <widget class="QComboBox" name="language"/>
+         </item>
         </layout>
        </widget>
        <widget class="QWidget" name="streamPage">
@@ -280,7 +289,7 @@
             <item row="0" column="1">
              <widget class="QComboBox" name="outputMode">
               <property name="enabled">
-               <bool>false</bool>
+               <bool>true</bool>
               </property>
               <property name="sizePolicy">
                <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
@@ -298,7 +307,7 @@
               </item>
               <item>
                <property name="text">
-                <string>Basic.Settings.Output.Mode.Custom</string>
+                <string>Basic.Settings.Output.Mode.Adv</string>
                </property>
               </item>
              </widget>
@@ -483,6 +492,13 @@
                      </property>
                     </widget>
                    </item>
+                   <item row="4" column="0">
+                    <widget class="QLabel" name="label_17">
+                     <property name="text">
+                      <string>Basic.Settings.Output.RetryDelay</string>
+                     </property>
+                    </widget>
+                   </item>
                    <item row="4" column="1">
                     <widget class="QSpinBox" name="simpleOutRetryDelay">
                      <property name="maximum">
@@ -490,6 +506,13 @@
                      </property>
                     </widget>
                    </item>
+                   <item row="5" column="0">
+                    <widget class="QLabel" name="label_22">
+                     <property name="text">
+                      <string>Basic.Settings.Output.MaxRetries</string>
+                     </property>
+                    </widget>
+                   </item>
                    <item row="5" column="1">
                     <widget class="QSpinBox" name="simpleOutMaxRetries">
                      <property name="minimum">
@@ -500,20 +523,6 @@
                      </property>
                     </widget>
                    </item>
-                   <item row="4" column="0">
-                    <widget class="QLabel" name="label_17">
-                     <property name="text">
-                      <string>Basic.Settings.Output.RetryDelay</string>
-                     </property>
-                    </widget>
-                   </item>
-                   <item row="5" column="0">
-                    <widget class="QLabel" name="label_22">
-                     <property name="text">
-                      <string>Basic.Settings.Output.MaxRetries</string>
-                     </property>
-                    </widget>
-                   </item>
                    <item row="6" column="1">
                     <widget class="QCheckBox" name="simpleOutAdvanced">
                      <property name="text">
@@ -524,13 +533,13 @@
                      </property>
                     </widget>
                    </item>
-                   <item row="9" column="1">
-                    <widget class="QLineEdit" name="simpleOutCustomX264"/>
-                   </item>
-                   <item row="9" column="0">
-                    <widget class="QLabel" name="label_23">
+                   <item row="7" column="1">
+                    <widget class="QCheckBox" name="simpleOutUseCBR">
                      <property name="text">
-                      <string>Basic.Settings.Output.CustomX264Settings</string>
+                      <string>Basic.Settings.Output.UseCBR</string>
+                     </property>
+                     <property name="checked">
+                      <bool>true</bool>
                      </property>
                     </widget>
                    </item>
@@ -540,7 +549,7 @@
                       <bool>true</bool>
                      </property>
                      <property name="text">
-                      <string>Basic.Settings.Output.X264Preset</string>
+                      <string>Basic.Settings.Output.EncoderPreset</string>
                      </property>
                     </widget>
                    </item>
@@ -588,16 +597,48 @@
                      </item>
                     </widget>
                    </item>
-                   <item row="7" column="1">
-                    <widget class="QCheckBox" name="simpleOutUseCBR">
+                   <item row="9" column="0">
+                    <widget class="QCheckBox" name="simpleOutUseBufsize">
+                     <property name="sizePolicy">
+                      <sizepolicy hsizetype="Minimum" vsizetype="Expanding">
+                       <horstretch>0</horstretch>
+                       <verstretch>0</verstretch>
+                      </sizepolicy>
+                     </property>
+                     <property name="layoutDirection">
+                      <enum>Qt::RightToLeft</enum>
+                     </property>
                      <property name="text">
-                      <string>Basic.Settings.Output.UseCBR</string>
+                      <string>Basic.Settings.Output.UseBufferSize</string>
                      </property>
-                     <property name="checked">
-                      <bool>true</bool>
+                    </widget>
+                   </item>
+                   <item row="9" column="1">
+                    <widget class="QSpinBox" name="simpleOutVBufsize">
+                     <property name="enabled">
+                      <bool>false</bool>
+                     </property>
+                     <property name="minimum">
+                      <number>0</number>
+                     </property>
+                     <property name="maximum">
+                      <number>1000000</number>
+                     </property>
+                     <property name="value">
+                      <number>2000</number>
+                     </property>
+                    </widget>
+                   </item>
+                   <item row="10" column="0">
+                    <widget class="QLabel" name="label_23">
+                     <property name="text">
+                      <string>Basic.Settings.Output.CustomEncoderSettings</string>
                      </property>
                     </widget>
                    </item>
+                   <item row="10" column="1">
+                    <widget class="QLineEdit" name="simpleOutCustom"/>
+                   </item>
                   </layout>
                  </widget>
                 </item>
@@ -606,7 +647,1177 @@
              </item>
             </layout>
            </widget>
-           <widget class="QWidget" name="customOutputsPage"/>
+           <widget class="QWidget" name="advOutputsPage">
+            <layout class="QVBoxLayout" name="verticalLayout_8">
+             <property name="leftMargin">
+              <number>0</number>
+             </property>
+             <property name="topMargin">
+              <number>0</number>
+             </property>
+             <property name="rightMargin">

obs-studio-0.8.2+git20150211.6099c65.tar.xz/obs/forms/images/configuration21_16.png Added

obs-studio-0.8.2+git20150211.6099c65.tar.xz/obs/forms/images/settings/advanced.png Added

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/obs/forms/obs.qrc -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/obs/forms/obs.qrc Changed

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/obs/obs-app.cpp -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/obs/obs-app.cpp Changed

@@ -127,17 +127,20 @@
 
 static bool MakeUserDirs()
 {
-	BPtr<char> path;
+	char path[512];
 
-	path = os_get_config_path("obs-studio");
+	if (os_get_config_path(path, sizeof(path), "obs-studio") <= 0)
+		return false;
 	if (!do_mkdir(path))
 		return false;
 
-	path = os_get_config_path("obs-studio/basic");
+	if (os_get_config_path(path, sizeof(path), "obs-studio/basic") <= 0)
+		return false;
 	if (!do_mkdir(path))
 		return false;
 
-	path = os_get_config_path("obs-studio/logs");
+	if (os_get_config_path(path, sizeof(path), "obs-studio/logs") <= 0)
+		return false;
 	if (!do_mkdir(path))
 		return false;
 
@@ -146,7 +149,13 @@
 
 bool OBSApp::InitGlobalConfig()
 {
-	BPtr<char> path(os_get_config_path("obs-studio/global.ini"));
+	char path[512];
+
+	int len = os_get_config_path(path, sizeof(path),
+			"obs-studio/global.ini");
+	if (len <= 0) {
+		return false;
+	}
 
 	int errorcode = globalConfig.Open(path, CONFIG_OPEN_ALWAYS);
 	if (errorcode != CONFIG_SUCCESS) {
@@ -408,7 +417,7 @@
 
 static void delete_oldest_log(void)
 {
-	BPtr<char>       logDir(os_get_config_path("obs-studio/logs"));
+	BPtr<char>       logDir(os_get_config_path_ptr("obs-studio/logs"));
 	string           oldestLog;
 	uint64_t         oldest_ts = (uint64_t)-1;
 	struct os_dirent *entry;
@@ -449,7 +458,7 @@
 
 static void get_last_log(void)
 {
-	BPtr<char>       logDir(os_get_config_path("obs-studio/logs"));
+	BPtr<char>       logDir(os_get_config_path_ptr("obs-studio/logs"));
 	struct os_dirent *entry;
 	os_dir_t         *dir        = os_opendir(logDir);
 	uint64_t         highest_ts = 0;
@@ -522,7 +531,7 @@
 	currentLogFile = GenerateTimeDateFilename("txt");
 	dst << "obs-studio/logs/" << currentLogFile.c_str();
 
-	BPtr<char> path(os_get_config_path(dst.str().c_str()));
+	BPtr<char> path(os_get_config_path_ptr(dst.str().c_str()));
 	logFile.open(path,
 			ios_base::in | ios_base::out | ios_base::trunc);
 
@@ -579,7 +588,6 @@
 static void load_debug_privilege(void)
 {
 	const DWORD flags = TOKEN_ADJUST_PRIVILEGES | TOKEN_QUERY;
-	bool success = false;
 	TOKEN_PRIVILEGES tp;
 	HANDLE token;
 	LUID val;
@@ -593,7 +601,7 @@
 		tp.Privileges[0].Luid = val;
 		tp.Privileges[0].Attributes = SE_PRIVILEGE_ENABLED;
 
-		success = !!AdjustTokenPrivileges(token, false, &tp,
+		AdjustTokenPrivileges(token, false, &tp,
 				sizeof(tp), NULL, NULL);
 	}
 
@@ -603,7 +611,7 @@
 
 int main(int argc, char *argv[])
 {
-#ifndef WIN32
+#ifndef _WIN32
 	signal(SIGPIPE, SIG_IGN);
 #endif

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/obs/properties-view.cpp -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/obs/properties-view.cpp Changed

@@ -1,4 +1,5 @@
 #include <QFormLayout>
+#include <QScrollBar>
 #include <QLabel>
 #include <QCheckBox>
 #include <QFont>
@@ -42,12 +43,21 @@
 
 void OBSPropertiesView::ReloadProperties()
 {
-	properties.reset(reloadCallback(obj));
+	if (obj) {
+		properties.reset(reloadCallback(obj));
+	} else {
+		properties.reset(reloadCallback((void*)type.c_str()));
+		obs_properties_apply_settings(properties.get(), settings);
+	}
+
 	RefreshProperties();
 }
 
 void OBSPropertiesView::RefreshProperties()
 {
+	int h, v;
+	GetScrollPos(h, v);
+
 	children.clear();
 	if (widget)
 		widget->deleteLater();
@@ -73,6 +83,7 @@
 
 	setWidgetResizable(true);
 	setWidget(widget);
+	SetScrollPos(h, v);
 	setSizePolicy(mainPolicy);
 
 	lastFocused.clear();
@@ -82,18 +93,53 @@
 	}
 }
 
+void OBSPropertiesView::SetScrollPos(int h, int v)
+{
+	QScrollBar *scroll = horizontalScrollBar();
+	if (scroll)
+		scroll->setValue(h);
+
+	scroll = verticalScrollBar();
+	if (scroll)
+		scroll->setValue(v);
+}
+
+void OBSPropertiesView::GetScrollPos(int &h, int &v)
+{
+	h = v = 0;
+
+	QScrollBar *scroll = horizontalScrollBar();
+	if (scroll)
+		h = scroll->value();
+
+	scroll = verticalScrollBar();
+	if (scroll)
+		v = scroll->value();
+}
+
 OBSPropertiesView::OBSPropertiesView(OBSData settings_, void *obj_,
 		PropertiesReloadCallback reloadCallback,
 		PropertiesUpdateCallback callback_, int minSize_)
 	: VScrollArea    (nullptr),
-	  widget         (nullptr),
 	  properties     (nullptr, obs_properties_destroy),
 	  settings       (settings_),
 	  obj            (obj_),
 	  reloadCallback (reloadCallback),
 	  callback       (callback_),
-	  minSize        (minSize_),
-	  lastWidget     (nullptr)
+	  minSize        (minSize_)
+{
+	setFrameShape(QFrame::NoFrame);
+	ReloadProperties();
+}
+
+OBSPropertiesView::OBSPropertiesView(OBSData settings_, const char *type_,
+		PropertiesReloadCallback reloadCallback_, int minSize_)
+	: VScrollArea    (nullptr),
+	  properties     (nullptr, obs_properties_destroy),
+	  settings       (settings_),
+	  type           (type_),
+	  reloadCallback (reloadCallback_),
+	  minSize        (minSize_)
 {
 	setFrameShape(QFrame::NoFrame);
 	ReloadProperties();
@@ -497,6 +543,11 @@
 			lastWidget = widget;
 }
 
+void OBSPropertiesView::SignalChanged()
+{
+	emit Changed();
+}
+
 void WidgetInfo::BoolChanged(const char *setting)
 {
 	QCheckBox *checkbox = static_cast<QCheckBox*>(widget);
@@ -696,7 +747,11 @@
 			return;
 	}
 
-	view->callback(view->obj, view->settings);
+	if (view->callback)
+		view->callback(view->obj, view->settings);
+
+	view->SignalChanged();
+
 	if (obs_property_modified(property, view->settings)) {
 		view->lastFocused = setting;
 		QMetaObject::invokeMethod(view, "RefreshProperties",

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/obs/properties-view.hpp -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/obs/properties-view.hpp Changed

@@ -55,16 +55,17 @@
 		std::unique_ptr<obs_properties_t, properties_delete_t>;
 
 private:
-	QWidget                                  *widget;
+	QWidget                                  *widget = nullptr;
 	properties_t                             properties;
 	OBSData                                  settings;
-	void                                     *obj;
+	void                                     *obj = nullptr;
+	std::string                              type;
 	PropertiesReloadCallback                 reloadCallback;
-	PropertiesUpdateCallback                 callback;
+	PropertiesUpdateCallback                 callback = nullptr;
 	int                                      minSize;
 	std::vector<std::unique_ptr<WidgetInfo>> children;
 	std::string                              lastFocused;
-	QWidget                                  *lastWidget;
+	QWidget                                  *lastWidget = nullptr;
 
 	QWidget *NewWidget(obs_property_t *prop, QWidget *widget,
 			const char *signal);
@@ -83,16 +84,26 @@
 
 	void resizeEvent(QResizeEvent *event) override;
 
+	void GetScrollPos(int &h, int &v);
+	void SetScrollPos(int h, int v);
+
 public slots:
 	void ReloadProperties();
 	void RefreshProperties();
+	void SignalChanged();
 
 signals:
 	void PropertiesResized();
+	void Changed();
 
 public:
 	OBSPropertiesView(OBSData settings, void *obj,
 			PropertiesReloadCallback reloadCallback,
 			PropertiesUpdateCallback callback,
 			int minSize = 0);
+	OBSPropertiesView(OBSData settings, const char *type,
+			PropertiesReloadCallback reloadCallback,
+			int minSize = 0);
+
+	inline obs_data_t *GetSettings() const {return settings;}
 };

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/obs/volume-control.cpp -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/obs/volume-control.cpp Changed

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/obs/volume-control.hpp -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/obs/volume-control.hpp Changed

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/obs/window-basic-adv-audio.cpp -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/obs/window-basic-adv-audio.cpp Changed

@@ -1,5 +1,5 @@
 #include <QVBoxLayout>
-#include <QHBoxLayout>
+#include <QGridLayout>
 #include <QScrollArea>
 #include <QLabel>
 #include "window-basic-adv-audio.hpp"
@@ -18,49 +18,32 @@
 {
 	QScrollArea *scrollArea;
 	QVBoxLayout *vlayout;
-	QHBoxLayout *hlayout;
 	QWidget *widget;
 	QLabel *label;
 
-	hlayout = new QHBoxLayout;
-	hlayout->setContentsMargins(0, 0, 0, 0);
+	mainLayout = new QGridLayout;
+	mainLayout->setContentsMargins(0, 0, 0, 0);
 	label = new QLabel(QTStr("Basic.AdvAudio.Name"));
-	label->setMinimumWidth(170);
 	label->setAlignment(Qt::AlignHCenter);
-	hlayout->addWidget(label);
+	mainLayout->addWidget(label, 0, 0);
 	label = new QLabel(QTStr("Basic.AdvAudio.Volume"));
-	label->setMinimumWidth(130);
-	label->setMaximumWidth(130);
 	label->setAlignment(Qt::AlignHCenter);
-	hlayout->addWidget(label);
+	mainLayout->addWidget(label, 0, 1);
 	label = new QLabel(QTStr("Basic.AdvAudio.Mono"));
-	label->setMinimumWidth(130);
-	label->setMaximumWidth(130);
 	label->setAlignment(Qt::AlignHCenter);
-	hlayout->addWidget(label);
+	mainLayout->addWidget(label, 0, 2);
 	label = new QLabel(QTStr("Basic.AdvAudio.Panning"));
-	label->setMinimumWidth(140);
-	label->setMaximumWidth(140);
 	label->setAlignment(Qt::AlignHCenter);
-	hlayout->addWidget(label);
+	mainLayout->addWidget(label, 0, 3);
 	label = new QLabel(QTStr("Basic.AdvAudio.SyncOffset"));
-	label->setMinimumWidth(130);
-	label->setMaximumWidth(130);
 	label->setAlignment(Qt::AlignHCenter);
-	hlayout->addWidget(label);
-	label = new QLabel(QTStr("Basic.AdvAudio.MediaChannel"));
-	label->setMinimumWidth(160);
-	label->setMaximumWidth(160);
+	mainLayout->addWidget(label, 0, 4);
+	label = new QLabel(QTStr("Basic.AdvAudio.AudioTracks"));
 	label->setAlignment(Qt::AlignHCenter);
-	hlayout->addWidget(label);
-	widget = new QWidget;
-	widget->setLayout(hlayout);
+	mainLayout->addWidget(label, 0, 5);
 
-	vlayout = new QVBoxLayout;
-	vlayout->setContentsMargins(0, 0, 0, 10);
-	vlayout->addWidget(widget);
 	controlArea = new QWidget;
-	controlArea->setLayout(vlayout);
+	controlArea->setLayout(mainLayout);
 	controlArea->setSizePolicy(QSizePolicy::Preferred,
 			QSizePolicy::Preferred);
 
@@ -128,8 +111,7 @@
 
 inline void OBSBasicAdvAudio::AddAudioSource(obs_source_t *source)
 {
-	OBSAdvAudioCtrl *control = new OBSAdvAudioCtrl(source);
-	controlArea->layout()->addWidget(control);
+	OBSAdvAudioCtrl *control = new OBSAdvAudioCtrl(mainLayout, source);
 	controls.push_back(control);
 }

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/obs/window-basic-adv-audio.hpp -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/obs/window-basic-adv-audio.hpp Changed

obs-studio-0.8.2+git20150211.6099c65.tar.xz/obs/window-basic-main-outputs.cpp Added

@@ -0,0 +1,711 @@
+#include <string>
+#include <QMessageBox>
+#include "window-basic-main.hpp"
+#include "window-basic-main-outputs.hpp"
+
+using namespace std;
+
+static void OBSStartStreaming(void *data, calldata_t *params)
+{
+	BasicOutputHandler *output = static_cast<BasicOutputHandler*>(data);
+	QMetaObject::invokeMethod(output->main, "StreamingStart");
+
+	UNUSED_PARAMETER(params);
+}
+
+static void OBSStopStreaming(void *data, calldata_t *params)
+{
+	BasicOutputHandler *output = static_cast<BasicOutputHandler*>(data);
+	int code = (int)calldata_int(params, "code");
+
+	QMetaObject::invokeMethod(output->main,
+			"StreamingStop", Q_ARG(int, code));
+	output->activeRefs--;
+}
+
+static void OBSStartRecording(void *data, calldata_t *params)
+{
+	BasicOutputHandler *output = static_cast<BasicOutputHandler*>(data);
+
+	QMetaObject::invokeMethod(output->main, "RecordingStart");
+
+	UNUSED_PARAMETER(params);
+}
+
+static void OBSStopRecording(void *data, calldata_t *params)
+{
+	BasicOutputHandler *output = static_cast<BasicOutputHandler*>(data);
+
+	QMetaObject::invokeMethod(output->main, "RecordingStop");
+	output->activeRefs--;
+
+	UNUSED_PARAMETER(params);
+}
+
+/* ------------------------------------------------------------------------ */
+
+struct SimpleOutput : BasicOutputHandler {
+	OBSEncoder             aac;
+	OBSEncoder             h264;
+
+	SimpleOutput(OBSBasic *main_);
+
+	virtual void Update() override;
+
+	void SetupOutputs();
+
+	virtual bool StartStreaming(obs_service_t *service) override;
+	virtual bool StartRecording() override;
+	virtual void StopStreaming() override;
+	virtual void StopRecording() override;
+	virtual bool StreamingActive() const override;
+	virtual bool RecordingActive() const override;
+};
+
+SimpleOutput::SimpleOutput(OBSBasic *main_) : BasicOutputHandler(main_)
+{
+	streamOutput = obs_output_create("rtmp_output", "simple_stream",
+			nullptr);
+	if (!streamOutput)
+		throw "Failed to create stream output (simple output)";
+
+	fileOutput = obs_output_create("flv_output", "simple_file_output",
+			nullptr);
+	if (!fileOutput)
+		throw "Failed to create recording output (simple output)";
+
+	h264 = obs_video_encoder_create("obs_x264", "simple_h264", nullptr);
+	if (!h264)
+		throw "Failed to create h264 encoder (simple output)";
+
+	aac = obs_audio_encoder_create("libfdk_aac", "simple_aac", nullptr, 0);
+	if (!aac)
+		aac = obs_audio_encoder_create("ffmpeg_aac", "simple_aac",
+				nullptr, 0);
+	if (!aac)
+		throw "Failed to create audio encoder (simple output)";
+
+	signal_handler_connect(obs_output_get_signal_handler(streamOutput),
+			"start", OBSStartStreaming, this);
+	signal_handler_connect(obs_output_get_signal_handler(streamOutput),
+			"stop", OBSStopStreaming, this);
+
+	signal_handler_connect(obs_output_get_signal_handler(fileOutput),
+			"start", OBSStartRecording, this);
+	signal_handler_connect(obs_output_get_signal_handler(fileOutput),
+			"stop", OBSStopRecording, this);
+}
+
+void SimpleOutput::Update()
+{
+	obs_data_t *h264Settings = obs_data_create();
+	obs_data_t *aacSettings  = obs_data_create();
+
+	int videoBitrate = config_get_uint(main->Config(), "SimpleOutput",
+			"VBitrate");
+	int videoBufsize = config_get_uint(main->Config(), "SimpleOutput",
+			"Bufsize");
+	int audioBitrate = config_get_uint(main->Config(), "SimpleOutput",
+			"ABitrate");
+	bool advanced = config_get_bool(main->Config(), "SimpleOutput",
+			"UseAdvanced");
+	bool useCBR = config_get_bool(main->Config(), "SimpleOutput",
+			"UseCBR");
+	bool useBufsize = config_get_bool(main->Config(), "SimpleOutput",
+			"UseBufsize");
+	const char *preset = config_get_string(main->Config(),
+			"SimpleOutput", "Preset");
+	const char *custom = config_get_string(main->Config(),
+			"SimpleOutput", "x264Settings");
+
+	obs_data_set_int(h264Settings, "bitrate", videoBitrate);
+	obs_data_set_bool(h264Settings, "use_bufsize", useBufsize);
+	obs_data_set_int(h264Settings, "buffer_size", videoBufsize);
+
+	if (advanced) {
+		obs_data_set_string(h264Settings, "preset", preset);
+		obs_data_set_string(h264Settings, "x264opts", custom);
+		obs_data_set_bool(h264Settings, "cbr", useCBR);
+	} else {
+		obs_data_set_bool(h264Settings, "cbr", true);
+	}
+
+	obs_data_set_int(aacSettings, "bitrate", audioBitrate);
+
+	obs_encoder_update(h264, h264Settings);
+	obs_encoder_update(aac,  aacSettings);
+
+	obs_data_release(h264Settings);
+	obs_data_release(aacSettings);
+}
+
+inline void SimpleOutput::SetupOutputs()
+{
+	SimpleOutput::Update();
+	obs_encoder_set_video(h264, obs_get_video());
+	obs_encoder_set_audio(aac,  obs_get_audio());
+
+	obs_service_apply_encoder_settings(main->GetService(), h264, aac);
+}
+
+bool SimpleOutput::StartStreaming(obs_service_t *service)
+{
+	if (!Active())
+		SetupOutputs();
+
+	obs_output_set_video_encoder(streamOutput, h264);
+	obs_output_set_audio_encoder(streamOutput, aac, 0);
+	obs_output_set_service(streamOutput, service);
+
+	bool reconnect = config_get_bool(main->Config(), "SimpleOutput",
+			"Reconnect");
+	int retryDelay = config_get_uint(main->Config(), "SimpleOutput",
+			"RetryDelay");
+	int maxRetries = config_get_uint(main->Config(), "SimpleOutput",
+			"MaxRetries");
+	if (!reconnect)
+		maxRetries = 0;
+
+	obs_output_set_reconnect_settings(streamOutput, maxRetries,
+			retryDelay);
+
+	if (obs_output_start(streamOutput)) {
+		activeRefs++;
+		return true;
+	}
+
+	return false;
+}
+
+bool SimpleOutput::StartRecording()
+{
+	if (!Active())
+		SetupOutputs();
+
+	const char *path = config_get_string(main->Config(),
+			"SimpleOutput", "FilePath");
+
+	os_dir_t *dir = path ? os_opendir(path) : nullptr;
+
+	if (!dir) {
+		QMessageBox::information(main,
+				QTStr("Output.BadPath.Title"),
+				QTStr("Output.BadPath.Text"));
+		return false;
+	}
+
+	os_closedir(dir);
+
+	string strPath;

obs-studio-0.8.2+git20150211.6099c65.tar.xz/obs/window-basic-main-outputs.hpp Added

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/obs/window-basic-main.cpp -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/obs/window-basic-main.cpp Changed

@@ -36,6 +36,7 @@
 #include "window-namedialog.hpp"
 #include "window-basic-source-select.hpp"
 #include "window-basic-main.hpp"
+#include "window-basic-main-outputs.hpp"
 #include "window-basic-properties.hpp"
 #include "window-log-reply.hpp"
 #include "window-remux.hpp"
@@ -62,10 +63,11 @@
 
 static void AddExtraModulePaths()
 {
-	BPtr<char> base_module_dir =
-		os_get_config_path("obs-studio/plugins/%module%");
+	char base_module_dir[512];
+	int ret = os_get_config_path(base_module_dir, sizeof(base_module_dir),
+			"obs-studio/plugins/%module%");
 
-	if (!base_module_dir)
+	if (ret <= 0)
 		return;
 
 	string path = (char*)base_module_dir;
@@ -80,6 +82,17 @@
 {
 	ui->setupUi(this);
 
+	char styleSheetPath[512];
+	int ret = os_get_config_path(styleSheetPath, sizeof(styleSheetPath),
+			"obs-studio/basic/stylesheet.qss");
+	if (ret > 0) {
+		if (QFile::exists(styleSheetPath)) {
+			QString path = QString("file:///") +
+				QT_UTF8(styleSheetPath);
+			App()->setStyleSheet(path);
+		}
+	}
+
 	qRegisterMetaType<OBSScene>    ("OBSScene");
 	qRegisterMetaType<OBSSceneItem>("OBSSceneItem");
 	qRegisterMetaType<OBSSource>   ("OBSSource");
@@ -282,36 +295,6 @@
 	return count != 0;
 }
 
-static void OBSStartStreaming(void *data, calldata_t *params)
-{
-	UNUSED_PARAMETER(params);
-	QMetaObject::invokeMethod(static_cast<OBSBasic*>(data),
-			"StreamingStart");
-}
-
-static void OBSStopStreaming(void *data, calldata_t *params)
-{
-	int code = (int)calldata_int(params, "code");
-	QMetaObject::invokeMethod(static_cast<OBSBasic*>(data),
-			"StreamingStop", Q_ARG(int, code));
-}
-
-static void OBSStartRecording(void *data, calldata_t *params)
-{
-	UNUSED_PARAMETER(params);
-
-	QMetaObject::invokeMethod(static_cast<OBSBasic*>(data),
-			"RecordingStart");
-}
-
-static void OBSStopRecording(void *data, calldata_t *params)
-{
-	UNUSED_PARAMETER(params);
-
-	QMetaObject::invokeMethod(static_cast<OBSBasic*>(data),
-			"RecordingStop");
-}
-
 #define SERVICE_PATH "obs-studio/basic/service.json"
 
 void OBSBasic::SaveService()
@@ -319,14 +302,16 @@
 	if (!service)
 		return;
 
-	BPtr<char> serviceJsonPath(os_get_config_path(SERVICE_PATH));
-	if (!serviceJsonPath)
+	char serviceJsonPath[512];
+	int ret = os_get_config_path(serviceJsonPath, sizeof(serviceJsonPath),
+			SERVICE_PATH);
+	if (ret <= 0)
 		return;
 
 	obs_data_t *data     = obs_data_create();
 	obs_data_t *settings = obs_service_get_settings(service);
 
-	obs_data_set_string(data, "type", obs_service_gettype(service));
+	obs_data_set_string(data, "type", obs_service_get_type(service));
 	obs_data_set_obj(data, "settings", settings);
 
 	const char *json = obs_data_get_json(data);
@@ -341,8 +326,15 @@
 {
 	const char *type;
 
-	BPtr<char> serviceJsonPath(os_get_config_path(SERVICE_PATH));
-	if (!serviceJsonPath)
+	if (service) {
+		obs_service_destroy(service);
+		service = nullptr;
+	}
+
+	char serviceJsonPath[512];
+	int ret = os_get_config_path(serviceJsonPath, sizeof(serviceJsonPath),
+			SERVICE_PATH);
+	if (ret <= 0)
 		return false;
 
 	BPtr<char> jsonText = os_quick_read_utf8_file(serviceJsonPath);
@@ -364,49 +356,6 @@
 	return !!service;
 }
 
-bool OBSBasic::InitOutputs()
-{
-	fileOutput = obs_output_create("flv_output", "default_file_output",
-			nullptr);
-	if (!fileOutput)
-		return false;
-
-	streamOutput = obs_output_create("rtmp_output", "default_stream",
-			nullptr);
-	if (!streamOutput)
-		return false;
-
-	signal_handler_connect(obs_output_get_signal_handler(streamOutput),
-			"start", OBSStartStreaming, this);
-	signal_handler_connect(obs_output_get_signal_handler(streamOutput),
-			"stop", OBSStopStreaming, this);
-
-	signal_handler_connect(obs_output_get_signal_handler(fileOutput),
-			"start", OBSStartRecording, this);
-	signal_handler_connect(obs_output_get_signal_handler(fileOutput),
-			"stop", OBSStopRecording, this);
-
-	return true;
-}
-
-bool OBSBasic::InitEncoders()
-{
-	x264 = obs_video_encoder_create("obs_x264", "default_h264", nullptr);
-	if (!x264)
-		return false;
-
-	aac = obs_audio_encoder_create("libfdk_aac", "default_aac", nullptr);
-
-	if (!aac)
-		aac = obs_audio_encoder_create("ffmpeg_aac", "default_aac",
-				nullptr);
-
-	if (!aac)
-		return false;
-
-	return true;
-}
-
 bool OBSBasic::InitService()
 {
 	if (LoadService())
@@ -441,7 +390,8 @@
 	uint32_t cx = monitors[0].cx;
 	uint32_t cy = monitors[0].cy;
 
-	/* TODO: temporary */
+	config_set_default_string(basicConfig, "Output", "Type", "Simple");
+
 	config_set_default_string(basicConfig, "SimpleOutput", "FilePath",
 			GetDefaultVideoSavePath().c_str());
 	config_set_default_uint  (basicConfig, "SimpleOutput", "VBitrate",
@@ -455,9 +405,47 @@
 	config_set_default_bool  (basicConfig, "SimpleOutput", "UseAdvanced",
 			false);
 	config_set_default_bool  (basicConfig, "SimpleOutput", "UseCBR", true);
+	config_set_default_bool  (basicConfig, "SimpleOutput", "UseBufsize",
+			false);
+	config_set_default_int   (basicConfig, "SimpleOutput", "Bufsize", 2500);
 	config_set_default_string(basicConfig, "SimpleOutput", "Preset",
 			"veryfast");
 
+	config_set_default_bool  (basicConfig, "AdvOut", "Reconnect", true);
+	config_set_default_uint  (basicConfig, "AdvOut", "RetryDelay", 2);
+	config_set_default_uint  (basicConfig, "AdvOut", "MaxRetries", 20);
+	config_set_default_bool  (basicConfig, "AdvOut", "ApplyServiceSettings",
+			true);
+	config_set_default_bool  (basicConfig, "AdvOut", "UseRescale", false);
+	config_set_default_bool  (basicConfig, "AdvOut", "Multitrack", false);
+	config_set_default_uint  (basicConfig, "AdvOut", "TrackIndex", 1);
+	config_set_default_uint  (basicConfig, "AdvOut", "TrackCount", 1);
+	config_set_default_string(basicConfig, "AdvOut", "Encoder", "obs_x264");
+
+	config_set_default_string(basicConfig, "AdvOut", "RecType", "Standard");
+
+	config_set_default_string(basicConfig, "AdvOut", "RecFilePath",

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/obs/window-basic-main.hpp -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/obs/window-basic-main.hpp Changed

@@ -47,6 +47,8 @@
 #define AUX_AUDIO_2     Str("AuxAudioDevice2")
 #define AUX_AUDIO_3     Str("AuxAudioDevice3")
 
+struct BasicOutputHandler;
+
 class OBSBasic : public OBSMainWindow {
 	Q_OBJECT
 
@@ -69,11 +71,8 @@
 	QPointer<QTimer>    cpuUsageTimer;
 	os_cpu_usage_info_t *cpuUsageInfo = nullptr;
 
-	obs_output_t  *fileOutput = nullptr;
-	obs_output_t  *streamOutput = nullptr;
 	obs_service_t *service = nullptr;
-	obs_encoder_t *aac = nullptr;
-	obs_encoder_t *x264 = nullptr;
+	std::unique_ptr<BasicOutputHandler> outputHandler;
 
 	gs_vertbuffer_t *box = nullptr;
 	gs_vertbuffer_t *circle = nullptr;
@@ -87,8 +86,6 @@
 
 	ConfigFile    basicConfig;
 
-	int           activeRefs = 0;
-
 	void          DrawBackdrop(float cx, float cy);
 
 	void          SetupEncoders();
@@ -102,11 +99,6 @@
 	void          Save(const char *file);
 	void          Load(const char *file);
 
-	void          SaveService();
-	bool          LoadService();
-
-	bool          InitOutputs();
-	bool          InitEncoders();
 	bool          InitService();
 
 	bool          InitBasicConfigDefaults();
@@ -197,9 +189,13 @@
 	obs_service_t *GetService();
 	void          SetService(obs_service_t *service);
 
+	bool StreamingActive();
+
 	int  ResetVideo();
 	bool ResetAudio();
 
+	void ResetOutputs();
+
 	void ResetAudioDevice(const char *sourceId, const char *deviceName,
 			const char *deviceDesc, int channel);
 	void ResetAudioDevices();
@@ -220,6 +216,9 @@
 		return os_cpu_usage_info_query(cpuUsageInfo);
 	}
 
+	void SaveService();
+	bool LoadService();
+
 protected:
 	virtual void closeEvent(QCloseEvent *event) override;
 	virtual void changeEvent(QEvent *event) override;
@@ -234,6 +233,7 @@
 	void on_actionRemux_triggered();
 	void on_action_Settings_triggered();
 	void on_actionAdvAudioProperties_triggered();
+	void on_advAudioProps_clicked();
 	void on_actionShowLogs_triggered();
 	void on_actionUploadCurrentLog_triggered();
 	void on_actionUploadLastLog_triggered();

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/obs/window-basic-properties.cpp -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/obs/window-basic-properties.cpp Changed

@@ -24,6 +24,7 @@
 #include <QCloseEvent>
 #include <QScreen>
 #include <QWindow>
+#include <QMessageBox>
 
 using namespace std;
 
@@ -31,6 +32,7 @@
 	: QDialog                (parent),
 	  main                   (qobject_cast<OBSBasic*>(parent)),
 	  resizeTimer            (0),
+	  acceptClicked          (false),
 	  ui                     (new Ui::OBSBasicProperties),
 	  source                 (source_),
 	  removedSignal          (obs_source_get_signal_handler(source),
@@ -39,20 +41,26 @@
 	  updatePropertiesSignal (obs_source_get_signal_handler(source),
 	                          "update_properties",
 	                          OBSBasicProperties::UpdateProperties,
-	                          this)
-
+	                          this),
+	  oldSettings            (obs_data_create()),
+	  buttonBox              (new QDialogButtonBox(this))
 {
 	int cx = (int)config_get_int(App()->GlobalConfig(), "PropertiesWindow",
 			"cx");
 	int cy = (int)config_get_int(App()->GlobalConfig(), "PropertiesWindow",
 			"cy");
 
+	buttonBox->setStandardButtons(QDialogButtonBox::Ok |
+			QDialogButtonBox::Cancel);
+	buttonBox->setObjectName(QStringLiteral("buttonBox"));
+
 	ui->setupUi(this);
 
 	if (cx > 400 && cy > 400)
 		resize(cx, cy);
 
 	OBSData settings = obs_source_get_settings(source);
+	obs_data_apply(oldSettings, settings);
 	obs_data_release(settings);
 
 	view = new OBSPropertiesView(settings, source,
@@ -60,6 +68,8 @@
 			(PropertiesUpdateCallback)obs_source_update);
 
 	layout()->addWidget(view);
+	layout()->addWidget(buttonBox);
+	layout()->setAlignment(buttonBox, Qt::AlignRight | Qt::AlignBottom);
 	layout()->setAlignment(view, Qt::AlignBottom);
 	view->setMaximumHeight(250);
 	view->setMinimumHeight(150);
@@ -92,6 +102,26 @@
 			"ReloadProperties");
 }
 
+void OBSBasicProperties::on_buttonBox_clicked(QAbstractButton *button)
+{
+	QDialogButtonBox::ButtonRole val = buttonBox->buttonRole(button);
+
+	if (val == QDialogButtonBox::AcceptRole) {
+		acceptClicked = true;
+		close();
+	}
+
+	if (val == QDialogButtonBox::RejectRole) {
+		obs_data_t *settings = obs_source_get_settings(source);
+		obs_data_clear(settings);
+		obs_data_release(settings);
+
+		obs_source_update(source, oldSettings);
+
+		close();
+	}
+}
+
 void OBSBasicProperties::DrawPreview(void *data, uint32_t cx, uint32_t cy)
 {
 	OBSBasicProperties *window = static_cast<OBSBasicProperties*>(data);
@@ -154,10 +184,19 @@
 
 void OBSBasicProperties::closeEvent(QCloseEvent *event)
 {
+	if (!acceptClicked && (CheckSettings() != 0)) {
+		if (!ConfirmQuit()) {
+			event->ignore();
+			return;
+		}
+	}
+
 	QDialog::closeEvent(event);
 	if (!event->isAccepted())
 		return;
 
+	obs_data_release(oldSettings);
+
 	// remove draw callback and release display in case our drawable
 	// surfaces go away before the destructor gets called
 	obs_display_remove_draw_callback(display,
@@ -188,3 +227,43 @@
 		obs_display_add_draw_callback(display,
 				OBSBasicProperties::DrawPreview, this);
 }
+
+int OBSBasicProperties::CheckSettings()
+{
+	OBSData currentSettings = obs_source_get_settings(source);
+	const char *oldSettingsJson = obs_data_get_json(oldSettings);
+	const char *currentSettingsJson = obs_data_get_json(currentSettings);
+
+	int ret = strcmp(currentSettingsJson, oldSettingsJson);
+
+	obs_data_release(currentSettings);
+	return ret;
+}
+
+bool OBSBasicProperties::ConfirmQuit()
+{
+	QMessageBox::StandardButton button;
+
+	button = QMessageBox::question(this,
+			QTStr("Basic.PropertiesWindow.ConfirmTitle"),
+			QTStr("Basic.PropertiesWindow.Confirm"),
+			QMessageBox::Save | QMessageBox::Discard |
+			QMessageBox::Cancel);
+
+	switch (button) {
+	case QMessageBox::Save:
+		// Do nothing because the settings are already updated
+		break;
+	case QMessageBox::Discard:
+		obs_source_update(source, oldSettings);
+		break;
+	case QMessageBox::Cancel:
+		return false;
+		break;
+	default:
+		/* If somehow the dialog fails to show, just default to
+		 * saving the settings. */
+		break;
+	}
+	return true;
+}

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/obs/window-basic-properties.hpp -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/obs/window-basic-properties.hpp Changed

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/obs/window-basic-settings.cpp -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/obs/window-basic-settings.cpp Changed

@@ -114,24 +114,20 @@
 #define SCROLL_CHANGED  SIGNAL(valueChanged(int))
 
 #define GENERAL_CHANGED SLOT(GeneralChanged())
+#define STREAM1_CHANGED SLOT(Stream1Changed())
 #define OUTPUTS_CHANGED SLOT(OutputsChanged())
 #define AUDIO_RESTART   SLOT(AudioChangedRestart())
 #define AUDIO_CHANGED   SLOT(AudioChanged())
 #define VIDEO_RESTART   SLOT(VideoChangedRestart())
 #define VIDEO_RES       SLOT(VideoChangedResolution())
 #define VIDEO_CHANGED   SLOT(VideoChanged())
+#define ADV_CHANGED     SLOT(AdvancedChanged())
+#define ADV_RESTART     SLOT(AdvancedChangedRestart())
 
 OBSBasicSettings::OBSBasicSettings(QWidget *parent)
 	: QDialog          (parent),
 	  main             (qobject_cast<OBSBasic*>(parent)),
-	  ui               (new Ui::OBSBasicSettings),
-	  generalChanged   (false),
-	  outputsChanged   (false),
-	  audioChanged     (false),
-	  videoChanged     (false),
-	  pageIndex        (0),
-	  loading          (true),
-	  streamProperties (nullptr)
+	  ui               (new Ui::OBSBasicSettings)
 {
 	string path;
 
@@ -139,6 +135,7 @@
 
 	HookWidget(ui->language,             COMBO_CHANGED,  GENERAL_CHANGED);
 	HookWidget(ui->outputMode,           COMBO_CHANGED,  OUTPUTS_CHANGED);
+	HookWidget(ui->streamType,           COMBO_CHANGED,  STREAM1_CHANGED);
 	HookWidget(ui->simpleOutputPath,     EDIT_CHANGED,   OUTPUTS_CHANGED);
 	HookWidget(ui->simpleOutputVBitrate, SCROLL_CHANGED, OUTPUTS_CHANGED);
 	HookWidget(ui->simpleOutputABitrate, COMBO_CHANGED,  OUTPUTS_CHANGED);
@@ -148,7 +145,51 @@
 	HookWidget(ui->simpleOutAdvanced,    CHECK_CHANGED,  OUTPUTS_CHANGED);
 	HookWidget(ui->simpleOutUseCBR,      CHECK_CHANGED,  OUTPUTS_CHANGED);
 	HookWidget(ui->simpleOutPreset,      COMBO_CHANGED,  OUTPUTS_CHANGED);
-	HookWidget(ui->simpleOutCustomX264,  EDIT_CHANGED,   OUTPUTS_CHANGED);
+	HookWidget(ui->simpleOutUseBufsize,  CHECK_CHANGED,  OUTPUTS_CHANGED);
+	HookWidget(ui->simpleOutPreset,      COMBO_CHANGED,  OUTPUTS_CHANGED);
+	HookWidget(ui->simpleOutVBufsize,    SCROLL_CHANGED, OUTPUTS_CHANGED);
+	HookWidget(ui->simpleOutCustom,      EDIT_CHANGED,   OUTPUTS_CHANGED);
+	HookWidget(ui->advOutReconnect,      CHECK_CHANGED,  OUTPUTS_CHANGED);
+	HookWidget(ui->advOutRetryDelay,     SCROLL_CHANGED, OUTPUTS_CHANGED);
+	HookWidget(ui->advOutMaxRetries,     SCROLL_CHANGED, OUTPUTS_CHANGED);
+	HookWidget(ui->advOutEncoder,        COMBO_CHANGED,  OUTPUTS_CHANGED);
+	HookWidget(ui->advOutUseRescale,     CHECK_CHANGED,  OUTPUTS_CHANGED);
+	HookWidget(ui->advOutRescale,        CBEDIT_CHANGED, OUTPUTS_CHANGED);
+	HookWidget(ui->advOutTrack1,         CHECK_CHANGED,  OUTPUTS_CHANGED);
+	HookWidget(ui->advOutTrack2,         CHECK_CHANGED,  OUTPUTS_CHANGED);
+	HookWidget(ui->advOutTrack3,         CHECK_CHANGED,  OUTPUTS_CHANGED);
+	HookWidget(ui->advOutTrack4,         CHECK_CHANGED,  OUTPUTS_CHANGED);
+	HookWidget(ui->advOutApplyService,   CHECK_CHANGED,  OUTPUTS_CHANGED);
+	HookWidget(ui->advOutRecType,        COMBO_CHANGED,  OUTPUTS_CHANGED);
+	HookWidget(ui->advOutRecPath,        EDIT_CHANGED,   OUTPUTS_CHANGED);
+	HookWidget(ui->advOutRecEncoder,     COMBO_CHANGED,  OUTPUTS_CHANGED);
+	HookWidget(ui->advOutRecUseRescale,  CHECK_CHANGED,  OUTPUTS_CHANGED);
+	HookWidget(ui->advOutRecRescale,     CBEDIT_CHANGED, OUTPUTS_CHANGED);
+	HookWidget(ui->advOutRecTrack1,      CHECK_CHANGED,  OUTPUTS_CHANGED);
+	HookWidget(ui->advOutRecTrack2,      CHECK_CHANGED,  OUTPUTS_CHANGED);
+	HookWidget(ui->advOutRecTrack3,      CHECK_CHANGED,  OUTPUTS_CHANGED);
+	HookWidget(ui->advOutRecTrack4,      CHECK_CHANGED,  OUTPUTS_CHANGED);
+	HookWidget(ui->advOutFFURL,          EDIT_CHANGED,   OUTPUTS_CHANGED);
+	HookWidget(ui->advOutFFVBitrate,     SCROLL_CHANGED, OUTPUTS_CHANGED);
+	HookWidget(ui->advOutFFUseRescale,   CHECK_CHANGED,  OUTPUTS_CHANGED);
+	HookWidget(ui->advOutFFRescale,      CBEDIT_CHANGED, OUTPUTS_CHANGED);
+	HookWidget(ui->advOutFFVEncoder,     EDIT_CHANGED,   OUTPUTS_CHANGED);
+	HookWidget(ui->advOutFFVCfg,         EDIT_CHANGED,   OUTPUTS_CHANGED);
+	HookWidget(ui->advOutFFABitrate,     SCROLL_CHANGED, OUTPUTS_CHANGED);
+	HookWidget(ui->advOutFFTrack1,       CHECK_CHANGED,  OUTPUTS_CHANGED);
+	HookWidget(ui->advOutFFTrack2,       CHECK_CHANGED,  OUTPUTS_CHANGED);
+	HookWidget(ui->advOutFFTrack3,       CHECK_CHANGED,  OUTPUTS_CHANGED);
+	HookWidget(ui->advOutFFTrack4,       CHECK_CHANGED,  OUTPUTS_CHANGED);
+	HookWidget(ui->advOutFFAEncoder,     EDIT_CHANGED,   OUTPUTS_CHANGED);
+	HookWidget(ui->advOutFFACfg,         EDIT_CHANGED,   OUTPUTS_CHANGED);
+	HookWidget(ui->advOutTrack1Bitrate,  COMBO_CHANGED,  OUTPUTS_CHANGED);
+	HookWidget(ui->advOutTrack1Name,     EDIT_CHANGED,   OUTPUTS_CHANGED);
+	HookWidget(ui->advOutTrack2Bitrate,  COMBO_CHANGED,  OUTPUTS_CHANGED);
+	HookWidget(ui->advOutTrack2Name,     EDIT_CHANGED,   OUTPUTS_CHANGED);
+	HookWidget(ui->advOutTrack3Bitrate,  COMBO_CHANGED,  OUTPUTS_CHANGED);
+	HookWidget(ui->advOutTrack3Name,     EDIT_CHANGED,   OUTPUTS_CHANGED);
+	HookWidget(ui->advOutTrack4Bitrate,  COMBO_CHANGED,  OUTPUTS_CHANGED);
+	HookWidget(ui->advOutTrack4Name,     EDIT_CHANGED,   OUTPUTS_CHANGED);
 	HookWidget(ui->channelSetup,         COMBO_CHANGED,  AUDIO_RESTART);
 	HookWidget(ui->sampleRate,           COMBO_CHANGED,  AUDIO_RESTART);
 	HookWidget(ui->desktopAudioDevice1,  COMBO_CHANGED,  AUDIO_CHANGED);
@@ -167,12 +208,17 @@
 	HookWidget(ui->fpsInteger,           SCROLL_CHANGED, VIDEO_CHANGED);
 	HookWidget(ui->fpsNumerator,         SCROLL_CHANGED, VIDEO_CHANGED);
 	HookWidget(ui->fpsDenominator,       SCROLL_CHANGED, VIDEO_CHANGED);
+	HookWidget(ui->audioBufferingTime,   SCROLL_CHANGED, ADV_RESTART);
+	HookWidget(ui->colorFormat,          COMBO_CHANGED,  ADV_CHANGED);
+	HookWidget(ui->colorSpace,           COMBO_CHANGED,  ADV_CHANGED);
+	HookWidget(ui->colorRange,           COMBO_CHANGED,  ADV_CHANGED);
 
 	//Apply button disabled until change.
 	EnableApplyButton(false);
 
 	LoadServiceTypes();
-	LoadServiceInfo();
+	LoadEncoderTypes();
+	LoadColorRanges();
 	LoadSettings(false);
 }
 
@@ -194,12 +240,15 @@
 	}
 }
 
-void OBSBasicSettings::SaveCheckBox(QCheckBox *widget, const char *section,
-		const char *value)
+void OBSBasicSettings::SaveCheckBox(QAbstractButton *widget,
+		const char *section, const char *value, bool invert)
 {
-	if (WidgetChanged(widget))
-		config_set_bool(main->Config(), section, value,
-				widget->isChecked());
+	if (WidgetChanged(widget)) {
+		bool checked = widget->isChecked();
+		if (invert) checked = !checked;
+
+		config_set_bool(main->Config(), section, value, checked);
+	}
 }
 
 void OBSBasicSettings::SaveEdit(QLineEdit *widget, const char *section,
@@ -230,25 +279,42 @@
 		ui->streamType->addItem(qName, qType);
 	}
 
-	type = obs_service_gettype(main->GetService());
+	type = obs_service_get_type(main->GetService());
 	SetComboByValue(ui->streamType, type);
 }
 
-void OBSBasicSettings::LoadServiceInfo()
+#define TEXT_USE_STREAM_ENC \
+	QTStr("Basic.Settings.Output.Adv.Recording.UseStreamEncoder")
+
+void OBSBasicSettings::LoadEncoderTypes()
 {
-	QLayout          *layout    = ui->streamContainer->layout();
-	obs_service_t    *service    = main->GetService();
-	obs_data_t       *settings   = obs_service_get_settings(service);
+	const char    *type;
+	size_t        idx = 0;
 
-	delete streamProperties;
-	streamProperties = new OBSPropertiesView(settings, service,
-			(PropertiesReloadCallback)obs_service_properties,
-			(PropertiesUpdateCallback)obs_service_update,
-			170);
+	ui->advOutRecEncoder->addItem(TEXT_USE_STREAM_ENC, "none");
 
-	layout->addWidget(streamProperties);
+	while (obs_enum_encoder_types(idx++, &type)) {
+		const char *name = obs_encoder_get_display_name(type);
+		const char *codec = obs_get_encoder_codec(type);
 
-	obs_data_release(settings);
+		if (strcmp(codec, "h264") != 0)
+			continue;
+
+		QString qName = QT_UTF8(name);
+		QString qType = QT_UTF8(type);
+
+		ui->advOutEncoder->addItem(qName, qType);
+		ui->advOutRecEncoder->addItem(qName, qType);
+	}
+}
+
+#define CS_PARTIAL_STR QTStr("Basic.Settings.Advanced.Video.ColorRange.Partial")
+#define CS_FULL_STR    QTStr("Basic.Settings.Advanced.Video.ColorRange.Full")
+
+void OBSBasicSettings::LoadColorRanges()
+{
+	ui->colorRange->addItem(CS_PARTIAL_STR, "Partial");
+	ui->colorRange->addItem(CS_FULL_STR, "Full");
 }
 
 void OBSBasicSettings::LoadLanguageList()
@@ -279,6 +345,37 @@
 	loading = false;
 }
 
+void OBSBasicSettings::LoadStream1Settings()
+{
+	QLayout *layout = ui->streamContainer->layout();
+	obs_service_t *service = main->GetService();
+	const char *type = obs_service_get_type(service);
+
+	loading = true;
+
+	obs_data_t *settings = obs_service_get_settings(service);
+
+	delete streamProperties;

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/obs/window-basic-settings.hpp -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/obs/window-basic-settings.hpp Changed

@@ -37,21 +37,25 @@
 	OBSBasic *main;
 
 	std::unique_ptr<Ui::OBSBasicSettings> ui;
-	bool generalChanged;
-	bool outputsChanged;
-	bool audioChanged;
-	bool videoChanged;
-	int  pageIndex;
-	bool loading;
-
-	OBSPropertiesView *streamProperties;
+	bool generalChanged = false;
+	bool stream1Changed = false;
+	bool outputsChanged = false;
+	bool audioChanged = false;
+	bool videoChanged = false;
+	bool advancedChanged = false;
+	int  pageIndex = 0;
+	bool loading = true;
+
+	OBSPropertiesView *streamProperties = nullptr;
+	OBSPropertiesView *streamEncoderProps = nullptr;
+	OBSPropertiesView *recordEncoderProps = nullptr;
 
 	void SaveCombo(QComboBox *widget, const char *section,
 			const char *value);
 	void SaveComboData(QComboBox *widget, const char *section,
 			const char *value);
-	void SaveCheckBox(QCheckBox *widget, const char *section,
-			const char *value);
+	void SaveCheckBox(QAbstractButton *widget, const char *section,
+			const char *value, bool invert = false);
 	void SaveEdit(QLineEdit *widget, const char *section,
 			const char *value);
 	void SaveSpinBox(QSpinBox *widget, const char *section,
@@ -59,8 +63,8 @@
 
 	inline bool Changed() const
 	{
-		return generalChanged || outputsChanged ||
-			audioChanged || videoChanged;
+		return generalChanged || outputsChanged || stream1Changed ||
+			audioChanged || videoChanged || advancedChanged;
 	}
 
 	inline void EnableApplyButton(bool en)
@@ -71,9 +75,11 @@
 	inline void ClearChanged()
 	{
 		generalChanged = false;
+		stream1Changed = false;
 		outputsChanged = false;
 		audioChanged   = false;
 		videoChanged   = false;
+		advancedChanged= false;
 		EnableApplyButton(false);
 	}
 
@@ -82,19 +88,31 @@
 	bool QueryChanges();
 
 	void LoadServiceTypes();
-	void LoadServiceInfo();
+	void LoadEncoderTypes();
+	void LoadColorRanges();
 
 	void LoadGeneralSettings();
+	void LoadStream1Settings();
 	void LoadOutputSettings();
 	void LoadAudioSettings();
 	void LoadVideoSettings();
+	void LoadAdvancedSettings();
 	void LoadSettings(bool changedOnly);
 
+	OBSPropertiesView *CreateEncoderPropertyView(const char *encoder,
+			const char *path, bool changed = false);
+
 	/* general */
 	void LoadLanguageList();
 
 	/* output */
 	void LoadSimpleOutputSettings();
+	void LoadAdvOutputStreamingSettings();
+	void LoadAdvOutputStreamingEncoderProperties();
+	void LoadAdvOutputRecordingSettings();
+	void LoadAdvOutputRecordingEncoderProperties();
+	void LoadAdvOutputFFmpegSettings();
+	void LoadAdvOutputAudioSettings();
 
 	/* audio */
 	void LoadListValues(QComboBox *widget, obs_property_t *prop,
@@ -103,23 +121,33 @@
 
 	/* video */
 	void LoadRendererList();
-	void ResetDownscales(uint32_t cx, uint32_t cy);
+	void ResetDownscales(uint32_t cx, uint32_t cy,
+			uint32_t out_cx, uint32_t out_cy);
 	void LoadDownscaleFilters();
 	void LoadResolutionLists();
 	void LoadFPSData();
 
 	void SaveGeneralSettings();
+	void SaveStream1Settings();
 	void SaveOutputSettings();
 	void SaveAudioSettings();
 	void SaveVideoSettings();
+	void SaveAdvancedSettings();
 	void SaveSettings();
 
 private slots:
+	void on_simpleOutUseBufsize_toggled(bool checked);
+	void on_simpleOutputVBitrate_valueChanged(int val);
+
 	void on_listWidget_itemSelectionChanged();
 	void on_buttonBox_clicked(QAbstractButton *button);
 
 	void on_streamType_currentIndexChanged(int idx);
 	void on_simpleOutputBrowse_clicked();
+	void on_advOutRecPathBrowse_clicked();
+	void on_advOutFFPathBrowse_clicked();
+	void on_advOutEncoder_currentIndexChanged(int idx);
+	void on_advOutRecEncoder_currentIndexChanged(int idx);
 
 	void on_baseResolution_editTextChanged(const QString &text);
 
@@ -127,9 +155,12 @@
 	void AudioChanged();
 	void AudioChangedRestart();
 	void OutputsChanged();
+	void Stream1Changed();
 	void VideoChanged();
 	void VideoChangedResolution();
 	void VideoChangedRestart();
+	void AdvancedChanged();
+	void AdvancedChangedRestart();
 
 protected:
 	virtual void closeEvent(QCloseEvent *event);

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/plugins/CMakeLists.txt -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/plugins/CMakeLists.txt Changed

obs-studio-0.8.2+git20150211.6099c65.tar.xz/plugins/image-source/data/locale/cs-CZ.ini Added

obs-studio-0.8.2+git20150211.6099c65.tar.xz/plugins/image-source/data/locale/zh-CN.ini Added

obs-studio-0.8.2+git20150211.6099c65.tar.xz/plugins/linux-capture/data/locale/cs-CZ.ini Added

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/plugins/linux-capture/data/locale/da-DK.ini -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/plugins/linux-capture/data/locale/da-DK.ini Changed

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/plugins/linux-capture/data/locale/de-DE.ini -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/plugins/linux-capture/data/locale/de-DE.ini Changed

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/plugins/linux-capture/data/locale/el-GR.ini -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/plugins/linux-capture/data/locale/el-GR.ini Changed

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/plugins/linux-capture/data/locale/es-ES.ini -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/plugins/linux-capture/data/locale/es-ES.ini Changed

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/plugins/linux-capture/data/locale/eu-ES.ini -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/plugins/linux-capture/data/locale/eu-ES.ini Changed

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/plugins/linux-capture/data/locale/fi-FI.ini -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/plugins/linux-capture/data/locale/fi-FI.ini Changed

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/plugins/linux-capture/data/locale/fr-FR.ini -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/plugins/linux-capture/data/locale/fr-FR.ini Changed

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/plugins/linux-capture/data/locale/gl-ES.ini -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/plugins/linux-capture/data/locale/gl-ES.ini Changed

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/plugins/linux-capture/data/locale/hr-HR.ini -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/plugins/linux-capture/data/locale/hr-HR.ini Changed

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/plugins/linux-capture/data/locale/hu-HU.ini -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/plugins/linux-capture/data/locale/hu-HU.ini Changed

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/plugins/linux-capture/data/locale/ja-JP.ini -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/plugins/linux-capture/data/locale/ja-JP.ini Changed

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/plugins/linux-capture/data/locale/ko-KR.ini -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/plugins/linux-capture/data/locale/ko-KR.ini Changed

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/plugins/linux-capture/data/locale/nb-NO.ini -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/plugins/linux-capture/data/locale/nb-NO.ini Changed

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/plugins/linux-capture/data/locale/nl-NL.ini -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/plugins/linux-capture/data/locale/nl-NL.ini Changed

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/plugins/linux-capture/data/locale/ro-RO.ini -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/plugins/linux-capture/data/locale/ro-RO.ini Changed

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/plugins/linux-capture/data/locale/ru-RU.ini -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/plugins/linux-capture/data/locale/ru-RU.ini Changed

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/plugins/linux-capture/data/locale/sl-SI.ini -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/plugins/linux-capture/data/locale/sl-SI.ini Changed

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/plugins/linux-capture/data/locale/sr-CS.ini -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/plugins/linux-capture/data/locale/sr-CS.ini Changed

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/plugins/linux-capture/data/locale/sr-SP.ini -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/plugins/linux-capture/data/locale/sr-SP.ini Changed

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/plugins/linux-capture/data/locale/sv-SE.ini -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/plugins/linux-capture/data/locale/sv-SE.ini Changed

obs-studio-0.8.2+git20150211.6099c65.tar.xz/plugins/linux-capture/data/locale/zh-CN.ini Added

obs-studio-0.8.2+git20150211.6099c65.tar.xz/plugins/linux-jack Added

obs-studio-0.8.2+git20150211.6099c65.tar.xz/plugins/linux-jack/CMakeLists.txt Added

obs-studio-0.8.2+git20150211.6099c65.tar.xz/plugins/linux-jack/data Added

obs-studio-0.8.2+git20150211.6099c65.tar.xz/plugins/linux-jack/data/locale Added

obs-studio-0.8.2+git20150211.6099c65.tar.xz/plugins/linux-jack/data/locale/en-US.ini Added

obs-studio-0.8.2+git20150211.6099c65.tar.xz/plugins/linux-jack/jack-input.c Added

@@ -0,0 +1,149 @@
+/*
+Copyright (C) 2015 by Bernd Buschinski <b.buschinski@gmail.com>
+
+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 <http://www.gnu.org/licenses/>.
+*/
+
+#include "jack-wrapper.h"
+
+#include <obs-module.h>
+
+/**
+ * Returns the name of the plugin
+ */
+static const char *jack_input_getname(void)
+{
+	return obs_module_text("JACKInput");
+}
+
+/**
+ * Destroy the plugin object and free all memory
+ */
+static void jack_destroy(void *vptr)
+{
+	struct jack_data* data = (struct jack_data*)vptr;
+
+	if (!data)
+		return;
+
+	deactivate_jack(data);
+
+	if (data->device)
+		bfree(data->device);
+	pthread_mutex_destroy(&data->jack_mutex);
+	bfree(data);
+}
+
+/**
+ * Update the input settings
+ */
+static void jack_update(void *vptr, obs_data_t *settings)
+{
+	struct jack_data* data = (struct jack_data*)vptr;
+	if (!data)
+		return;
+
+	const char *new_device;
+	bool settings_changed      = false;
+	bool new_jack_start_server = obs_data_get_bool(settings, "startjack");
+	int new_channel_count      = obs_data_get_int(settings, "channels");
+
+	if (new_jack_start_server != data->start_jack_server) {
+		data->start_jack_server = new_jack_start_server;
+		settings_changed = true;
+	}
+
+	if (new_channel_count != data->channels)
+		/*
+		 * keep "old" channel count  for now,
+		 * we need to destroy the correct number of channels
+		 */
+		settings_changed = true;
+
+	new_device = obs_source_get_name(data->source);
+	if (!data->device || strcmp(data->device, new_device) != 0) {
+		if (data->device)
+			bfree(data->device);
+		data->device = bstrdup(new_device);
+		settings_changed = true;
+	}
+
+	if (settings_changed) {
+		deactivate_jack(data);
+
+		data->channels = new_channel_count;
+
+		if (jack_init(data) != 0) {
+			deactivate_jack(data);
+		}
+	}
+}
+
+/**
+ * Create the plugin object
+ */
+static void *jack_create(obs_data_t *settings, obs_source_t *source)
+{
+	struct jack_data *data = bzalloc(sizeof(struct jack_data));
+
+	pthread_mutex_init(&data->jack_mutex, NULL);
+	data->source   = source;
+	data->channels = -1;
+
+	jack_update(data, settings);
+
+	if (data->jack_client == NULL) {
+		jack_destroy(data);
+		return NULL;
+	}
+	return data;
+}
+
+/**
+ * Get plugin defaults
+ */
+static void jack_input_defaults(obs_data_t *settings)
+{
+	obs_data_set_default_int(settings, "channels", 2);
+	obs_data_set_default_bool(settings, "startjack", false);
+}
+
+/**
+ * Get plugin properties
+ */
+static obs_properties_t *jack_input_properties(void *unused)
+{
+	(void)unused;
+
+	obs_properties_t *props = obs_properties_create();
+
+	obs_properties_add_int(props, "channels",
+		obs_module_text("Channels"), 1, 8, 1);
+	obs_properties_add_bool(props, "startjack",
+		obs_module_text("StartJACKServer"));
+
+	return props;
+}
+
+struct obs_source_info jack_output_capture = {
+	.id             = "jack_output_capture",
+	.type           = OBS_SOURCE_TYPE_INPUT,
+	.output_flags   = OBS_SOURCE_AUDIO,
+	.get_name       = jack_input_getname,
+	.create         = jack_create,
+	.destroy        = jack_destroy,
+	.update         = jack_update,
+	.get_defaults   = jack_input_defaults,
+	.get_properties = jack_input_properties
+};

obs-studio-0.8.2+git20150211.6099c65.tar.xz/plugins/linux-jack/jack-wrapper.c Added

@@ -0,0 +1,160 @@
+/*
+Copyright (C) 2015 by Bernd Buschinski <b.buschinski@gmail.com>
+
+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 <http://www.gnu.org/licenses/>.
+*/
+
+#include "jack-wrapper.h"
+
+#include <pthread.h>
+#include <stdio.h>
+
+#include <util/platform.h>
+
+#define blog(level, msg, ...) blog(level, "jack-input: " msg, ##__VA_ARGS__)
+
+/**
+ * Get obs speaker layout from number of channels
+ *
+ * @param channels number of channels reported by jack
+ *
+ * @return obs speaker_layout id
+ *
+ * @note This *might* not work for some rather unusual setups, but should work
+ *       fine for the majority of cases.
+ */
+static enum speaker_layout jack_channels_to_obs_speakers(uint_fast32_t channels)
+{
+	switch(channels) {
+	case 1: return SPEAKERS_MONO;
+	case 2: return SPEAKERS_STEREO;
+	case 3: return SPEAKERS_2POINT1;
+	case 4: return SPEAKERS_SURROUND;
+	case 5: return SPEAKERS_4POINT1;
+	case 6: return SPEAKERS_5POINT1;
+	/* What should we do with 7 channels? */
+	/* case 7: return SPEAKERS_...; */
+	case 8: return SPEAKERS_7POINT1;
+	}
+
+	return SPEAKERS_UNKNOWN;
+}
+
+int jack_process_callback(jack_nframes_t nframes, void* arg)
+{
+	struct jack_data* data = (struct jack_data*)arg;
+	if (data == 0)
+		return 0;
+
+	pthread_mutex_lock(&data->jack_mutex);
+
+	struct obs_source_audio out;
+	out.speakers        = jack_channels_to_obs_speakers(data->channels);
+	out.samples_per_sec = jack_get_sample_rate (data->jack_client);
+	/* format is always 32 bit float for jack */
+	out.format          = AUDIO_FORMAT_FLOAT_PLANAR;
+
+	for (unsigned int i = 0; i < data->channels; ++i) {
+		jack_default_audio_sample_t *jack_buffer =
+			(jack_default_audio_sample_t *)jack_port_get_buffer(
+				data->jack_ports[i], nframes);
+		out.data[i] = (uint8_t *)jack_buffer;
+	}
+
+	out.frames    = nframes;
+	out.timestamp = os_gettime_ns() -
+				jack_frames_to_time(data->jack_client, nframes);
+
+	obs_source_output_audio(data->source, &out);
+	pthread_mutex_unlock(&data->jack_mutex);
+	return 0;
+}
+
+int_fast32_t jack_init(struct jack_data* data)
+{
+	pthread_mutex_lock(&data->jack_mutex);
+
+	if (data->jack_client != NULL)
+		goto good;
+
+	jack_options_t jack_option = data->start_jack_server ?
+		JackNullOption : JackNoStartServer;
+
+	data->jack_client = jack_client_open(data->device, jack_option, 0);
+	if (data->jack_client == NULL) {
+		blog(LOG_ERROR,
+			"jack_client_open Error:"
+			"Could not create JACK client! %s",
+			data->device);
+		goto error;
+	}
+
+	data->jack_ports = (jack_port_t**)bzalloc(
+		sizeof(jack_port_t*) * data->channels);
+	for (unsigned int i = 0; i < data->channels; ++i) {
+		char port_name[10] = {'\0'};
+		snprintf(port_name, sizeof(port_name), "in_%d", i+1);
+
+		data->jack_ports[i] = jack_port_register(data->jack_client,
+			port_name, JACK_DEFAULT_AUDIO_TYPE, JackPortIsInput, 0);
+		if (data->jack_ports[i] == NULL) {
+			blog(LOG_ERROR,
+				"jack_port_register Error:"
+				"Could not create JACK port! %s",
+				port_name);
+			goto error;
+		}
+	}
+
+	if (jack_set_process_callback(data->jack_client,
+			jack_process_callback, data) != 0) {
+		blog(LOG_ERROR, "jack_set_process_callback Error");
+		goto error;
+	}
+
+	if (jack_activate(data->jack_client) != 0) {
+		blog(LOG_ERROR,
+			"jack_activate Error:"
+			"Could not activate JACK client!");
+		goto error;
+	}
+
+good:
+	pthread_mutex_unlock(&data->jack_mutex);
+	return 0;
+
+error:
+	pthread_mutex_unlock(&data->jack_mutex);
+	return 1;
+}
+
+void deactivate_jack(struct jack_data* data)
+{
+	pthread_mutex_lock(&data->jack_mutex);
+
+	if (data->jack_client) {
+		if (data->jack_ports != NULL) {
+			for (int i = 0; i < data->channels; ++i) {
+				if (data->jack_ports[i] != NULL)
+					jack_port_unregister(data->jack_client,
+						data->jack_ports[i]);
+			}
+			bfree(data->jack_ports);
+			data->jack_ports = NULL;
+		}
+		jack_client_close(data->jack_client);
+		data->jack_client = NULL;
+	}
+	pthread_mutex_unlock(&data->jack_mutex);
+}

obs-studio-0.8.2+git20150211.6099c65.tar.xz/plugins/linux-jack/jack-wrapper.h Added

@@ -0,0 +1,51 @@
+/*
+Copyright (C) 2015 by Bernd Buschinski <b.buschinski@gmail.com>
+
+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 <http://www.gnu.org/licenses/>.
+*/
+
+#pragma once
+
+#include <jack/jack.h>
+#include <obs.h>
+#include <pthread.h>
+
+struct jack_data {
+	obs_source_t *source;
+
+	/* user settings */
+	char *device;
+	uint_fast8_t channels;
+	bool start_jack_server;
+
+	/* server info */
+	enum speaker_layout speakers;
+	uint_fast32_t samples_per_sec;
+	uint_fast32_t bytes_per_frame;
+
+	jack_client_t *jack_client;
+	jack_port_t **jack_ports;
+
+	pthread_mutex_t jack_mutex;
+};
+
+/**
+ * Initialize the jack client and register the ports
+ */
+int_fast32_t jack_init(struct jack_data* data);
+
+/**
+ * Destroys the jack client and unregisters the ports
+ */
+void deactivate_jack(struct jack_data* data);

obs-studio-0.8.2+git20150211.6099c65.tar.xz/plugins/linux-jack/linux-jack.c Added

obs-studio-0.8.2+git20150211.6099c65.tar.xz/plugins/linux-pulseaudio/data/locale/cs-CZ.ini Added

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/plugins/linux-pulseaudio/data/locale/fr-FR.ini -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/plugins/linux-pulseaudio/data/locale/fr-FR.ini Changed

obs-studio-0.8.2+git20150211.6099c65.tar.xz/plugins/linux-pulseaudio/data/locale/zh-CN.ini Added

obs-studio-0.8.2+git20150211.6099c65.tar.xz/plugins/linux-v4l2/data/locale/cs-CZ.ini Added

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/plugins/linux-v4l2/data/locale/de-DE.ini -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/plugins/linux-v4l2/data/locale/de-DE.ini Changed

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/plugins/linux-v4l2/data/locale/nb-NO.ini -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/plugins/linux-v4l2/data/locale/nb-NO.ini Changed

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/plugins/linux-v4l2/data/locale/pl-PL.ini -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/plugins/linux-v4l2/data/locale/pl-PL.ini Changed

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/plugins/linux-v4l2/data/locale/sv-SE.ini -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/plugins/linux-v4l2/data/locale/sv-SE.ini Changed

obs-studio-0.8.2+git20150211.6099c65.tar.xz/plugins/linux-v4l2/data/locale/zh-CN.ini Added

obs-studio-0.8.2+git20150211.6099c65.tar.xz/plugins/mac-avcapture/data/locale/cs-CZ.ini Added

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/plugins/mac-avcapture/data/locale/de-DE.ini -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/plugins/mac-avcapture/data/locale/de-DE.ini Changed

obs-studio-0.8.2+git20150211.6099c65.tar.xz/plugins/mac-avcapture/data/locale/zh-CN.ini Added

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/plugins/mac-capture/data/locale/de-DE.ini -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/plugins/mac-capture/data/locale/de-DE.ini Changed

obs-studio-0.8.2+git20150211.6099c65.tar.xz/plugins/mac-capture/data/locale/zh-CN.ini Added

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/plugins/mac-syphon/data/locale/da-DK.ini -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/plugins/mac-syphon/data/locale/da-DK.ini Changed

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/plugins/mac-syphon/data/locale/de-DE.ini -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/plugins/mac-syphon/data/locale/de-DE.ini Changed

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/plugins/mac-syphon/data/locale/el-GR.ini -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/plugins/mac-syphon/data/locale/el-GR.ini Changed

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/plugins/mac-syphon/data/locale/en-US.ini -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/plugins/mac-syphon/data/locale/en-US.ini Changed

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/plugins/mac-syphon/data/locale/es-ES.ini -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/plugins/mac-syphon/data/locale/es-ES.ini Changed

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/plugins/mac-syphon/data/locale/eu-ES.ini -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/plugins/mac-syphon/data/locale/eu-ES.ini Changed

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/plugins/mac-syphon/data/locale/fi-FI.ini -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/plugins/mac-syphon/data/locale/fi-FI.ini Changed

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/plugins/mac-syphon/data/locale/fr-FR.ini -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/plugins/mac-syphon/data/locale/fr-FR.ini Changed

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/plugins/mac-syphon/data/locale/hr-HR.ini -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/plugins/mac-syphon/data/locale/hr-HR.ini Changed

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/plugins/mac-syphon/data/locale/ja-JP.ini -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/plugins/mac-syphon/data/locale/ja-JP.ini Changed

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/plugins/mac-syphon/data/locale/ko-KR.ini -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/plugins/mac-syphon/data/locale/ko-KR.ini Changed

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/plugins/mac-syphon/data/locale/nb-NO.ini -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/plugins/mac-syphon/data/locale/nb-NO.ini Changed

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/plugins/mac-syphon/data/locale/nl-NL.ini -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/plugins/mac-syphon/data/locale/nl-NL.ini Changed

obs-studio-0.8.2+git20150211.6099c65.tar.xz/plugins/mac-syphon/data/locale/pl-PL.ini Added

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/plugins/mac-syphon/data/locale/ru-RU.ini -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/plugins/mac-syphon/data/locale/ru-RU.ini Changed

obs-studio-0.8.2+git20150211.6099c65.tar.xz/plugins/mac-syphon/data/locale/sl-SI.ini Added

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/plugins/mac-syphon/data/locale/sr-CS.ini -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/plugins/mac-syphon/data/locale/sr-CS.ini Changed

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/plugins/mac-syphon/data/locale/sr-SP.ini -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/plugins/mac-syphon/data/locale/sr-SP.ini Changed

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/plugins/mac-syphon/data/locale/sv-SE.ini -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/plugins/mac-syphon/data/locale/sv-SE.ini Changed

obs-studio-0.8.2+git20150211.6099c65.tar.xz/plugins/mac-syphon/data/locale/zh-CN.ini Added

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/plugins/mac-syphon/syphon.m -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/plugins/mac-syphon/syphon.m Changed

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/plugins/obs-ffmpeg/CMakeLists.txt -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/plugins/obs-ffmpeg/CMakeLists.txt Changed

obs-studio-0.8.2+git20150211.6099c65.tar.xz/plugins/obs-ffmpeg/closest-pixel-format.h Added

@@ -0,0 +1,115 @@
+#pragma once
+
+static const enum AVPixelFormat i420_formats[] = {
+	AV_PIX_FMT_YUV420P,
+	AV_PIX_FMT_NV12,
+	AV_PIX_FMT_NV21,
+	AV_PIX_FMT_YUYV422,
+	AV_PIX_FMT_UYVY422,
+	AV_PIX_FMT_YUV422P,
+	AV_PIX_FMT_NONE
+};
+
+static const enum AVPixelFormat nv12_formats[] = {
+	AV_PIX_FMT_NV12,
+	AV_PIX_FMT_NV21,
+	AV_PIX_FMT_YUV420P,
+	AV_PIX_FMT_YUYV422,
+	AV_PIX_FMT_UYVY422,
+	AV_PIX_FMT_NONE
+};
+
+static const enum AVPixelFormat yuy2_formats[] = {
+	AV_PIX_FMT_YUYV422,
+	AV_PIX_FMT_UYVY422,
+	AV_PIX_FMT_NV12,
+	AV_PIX_FMT_NV21,
+	AV_PIX_FMT_YUV420P,
+	AV_PIX_FMT_NONE
+};
+
+static const enum AVPixelFormat uyvy_formats[] = {
+	AV_PIX_FMT_UYVY422,
+	AV_PIX_FMT_YUYV422,
+	AV_PIX_FMT_NV12,
+	AV_PIX_FMT_NV21,
+	AV_PIX_FMT_YUV420P,
+	AV_PIX_FMT_NONE
+};
+
+static const enum AVPixelFormat rgba_formats[] = {
+	AV_PIX_FMT_RGBA,
+	AV_PIX_FMT_BGRA,
+	AV_PIX_FMT_YUYV422,
+	AV_PIX_FMT_UYVY422,
+	AV_PIX_FMT_NV12,
+	AV_PIX_FMT_NV21,
+	AV_PIX_FMT_NONE
+};
+
+static const enum AVPixelFormat bgra_formats[] = {
+	AV_PIX_FMT_BGRA,
+	AV_PIX_FMT_RGBA,
+	AV_PIX_FMT_YUYV422,
+	AV_PIX_FMT_UYVY422,
+	AV_PIX_FMT_NV12,
+	AV_PIX_FMT_NV21,
+	AV_PIX_FMT_NONE
+};
+
+static enum AVPixelFormat get_best_format(
+		const enum AVPixelFormat *best,
+		const enum AVPixelFormat *formats)
+{
+	while (*best != AV_PIX_FMT_NONE) {
+		enum AVPixelFormat best_format = *best;
+		const enum AVPixelFormat *cur_formats = formats;
+
+		while (*cur_formats != AV_PIX_FMT_NONE) {
+			enum AVPixelFormat avail_format = *cur_formats;
+
+			if (best_format == avail_format)
+				return best_format;
+
+			cur_formats++;
+		}
+
+		best++;
+	}
+
+	return AV_PIX_FMT_NONE;
+}
+
+static inline enum AVPixelFormat get_closest_format(
+		enum AVPixelFormat format,
+		const enum AVPixelFormat *formats)
+{
+	enum AVPixelFormat best_format = AV_PIX_FMT_NONE;
+
+	if (!formats || formats[0] == AV_PIX_FMT_NONE)
+		return format;
+
+	switch ((int)format) {
+
+	case AV_PIX_FMT_YUV420P:
+		best_format = get_best_format(i420_formats, formats);
+		break;
+	case AV_PIX_FMT_NV12:
+		best_format = get_best_format(nv12_formats, formats);
+		break;
+	case AV_PIX_FMT_YUYV422:
+		best_format = get_best_format(yuy2_formats, formats);
+		break;
+	case AV_PIX_FMT_UYVY422:
+		best_format = get_best_format(uyvy_formats, formats);
+		break;
+	case AV_PIX_FMT_RGBA:
+		best_format = get_best_format(rgba_formats, formats);
+		break;
+	case AV_PIX_FMT_BGRA:
+		best_format = get_best_format(bgra_formats, formats);
+		break;
+	}
+
+	return (best_format == AV_PIX_FMT_NONE) ? formats[0] : best_format;
+}

obs-studio-0.8.2+git20150211.6099c65.tar.xz/plugins/obs-ffmpeg/data/locale/zh-CN.ini Added

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/plugins/obs-ffmpeg/obs-ffmpeg-output.c -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/plugins/obs-ffmpeg/obs-ffmpeg-output.c Changed

@@ -27,13 +27,23 @@
 #include <libswscale/swscale.h>
 
 #include "obs-ffmpeg-formats.h"
+#include "closest-pixel-format.h"
 #include "obs-ffmpeg-compat.h"
 
-//#define OBS_FFMPEG_VIDEO_FORMAT VIDEO_FORMAT_I420
-#define OBS_FFMPEG_VIDEO_FORMAT VIDEO_FORMAT_NV12
-
-/* NOTE: much of this stuff is test stuff that was more or less copied from
- * the muxing.c ffmpeg example */
+struct ffmpeg_cfg {
+	const char         *url;
+	int                video_bitrate;
+	int                audio_bitrate;
+	const char         *video_encoder;
+	const char         *audio_encoder;
+	const char         *video_settings;
+	const char         *audio_settings;
+	enum AVPixelFormat format;
+	int                scale_width;
+	int                scale_height;
+	int                width;
+	int                height;
+};
 
 struct ffmpeg_data {
 	AVStream           *video;
@@ -43,18 +53,13 @@
 	AVFormatContext    *output;
 	struct SwsContext  *swscale;
 
-	int                video_bitrate;
 	AVPicture          dst_picture;
 	AVFrame            *vframe;
 	int                frame_size;
 	int                total_frames;
 
-	int                width;
-	int                height;
-
 	uint64_t           start_timestamp;
 
-	int                audio_bitrate;
 	uint32_t           audio_samplerate;
 	enum audio_format  audio_format;
 	size_t             audio_planes;
@@ -64,7 +69,7 @@
 	AVFrame            *aframe;
 	int                total_samples;
 
-	const char         *filename_test;
+	struct ffmpeg_cfg  config;
 
 	bool               initialized;
 };
@@ -89,9 +94,12 @@
 /* ------------------------------------------------------------------------- */
 
 static bool new_stream(struct ffmpeg_data *data, AVStream **stream,
-		AVCodec **codec, enum AVCodecID id)
+		AVCodec **codec, enum AVCodecID id, const char *name)
 {
-	*codec = avcodec_find_encoder(id);
+	*codec = (!!name && *name) ?
+		avcodec_find_encoder_by_name(name) :
+		avcodec_find_encoder(id);
+
 	if (!*codec) {
 		blog(LOG_WARNING, "Couldn't find encoder '%s'",
 				avcodec_get_name(id));
@@ -109,14 +117,41 @@
 	return true;
 }
 
+static void parse_params(AVCodecContext *context, char **opts)
+{
+	if (!context || !context->priv_data)
+		return;
+
+	while (*opts) {
+		char *opt = *opts;
+		char *assign = strchr(opt, '=');
+
+		if (assign) {
+			char *name = opt;
+			char *value;
+
+			*assign = 0;
+			value = assign+1;
+
+			av_opt_set(context->priv_data, name, value, 0);
+		}
+
+		opts++;
+	}
+}
+
 static bool open_video_codec(struct ffmpeg_data *data)
 {
 	AVCodecContext *context = data->video->codec;
+	char **opts = strlist_split(data->config.video_settings, ' ', false);
 	int ret;
 
-	if (data->vcodec->id == AV_CODEC_ID_H264) {
+	if (data->vcodec->id == AV_CODEC_ID_H264)
 		av_opt_set(context->priv_data, "preset", "veryfast", 0);
-		av_opt_set(context->priv_data, "x264-params", "nal-hrd=cbr", 0);
+
+	if (opts) {
+		parse_params(context, opts);
+		strlist_free(opts);
 	}
 
 	ret = avcodec_open2(context, data->vcodec, NULL);
@@ -150,12 +185,11 @@
 
 static bool init_swscale(struct ffmpeg_data *data, AVCodecContext *context)
 {
-	enum AVPixelFormat format;
-	format = obs_to_ffmpeg_video_format(OBS_FFMPEG_VIDEO_FORMAT);
-
 	data->swscale = sws_getContext(
-			context->width, context->height, format,
-			context->width, context->height, context->pix_fmt,
+			data->config.width, data->config.height,
+			data->config.format,
+			data->config.scale_width, data->config.scale_height,
+			context->pix_fmt,
 			SWS_BICUBIC, NULL, NULL, NULL);
 
 	if (!data->swscale) {
@@ -168,11 +202,9 @@
 
 static bool create_video_stream(struct ffmpeg_data *data)
 {
+	enum AVPixelFormat closest_format;
 	AVCodecContext *context;
 	struct obs_video_info ovi;
-	enum AVPixelFormat vformat;
-
-	vformat = obs_to_ffmpeg_video_format(OBS_FFMPEG_VIDEO_FORMAT);
 
 	if (!obs_get_video_info(&ovi)) {
 		blog(LOG_WARNING, "No active video");
@@ -180,20 +212,21 @@
 	}
 
 	if (!new_stream(data, &data->video, &data->vcodec,
-				data->output->oformat->video_codec))
+				data->output->oformat->video_codec,
+				data->config.video_encoder))
 		return false;
 
+	closest_format = get_closest_format(data->config.format,
+			data->vcodec->pix_fmts);
+
 	context                 = data->video->codec;
-	context->codec_id       = data->output->oformat->video_codec;
-	context->bit_rate       = data->video_bitrate * 1000;
-	context->rc_buffer_size = data->video_bitrate * 1000;
-	context->rc_max_rate    = data->video_bitrate * 1000;
-	context->width          = data->width;
-	context->height         = data->height;
+	context->bit_rate       = data->config.video_bitrate * 1000;
+	context->width          = data->config.scale_width;
+	context->height         = data->config.scale_height;
 	context->time_base.num  = ovi.fps_den;
 	context->time_base.den  = ovi.fps_num;
 	context->gop_size       = 120;
-	context->pix_fmt        = vformat;
+	context->pix_fmt        = closest_format;
 
 	if (data->output->oformat->flags & AVFMT_GLOBALHEADER)
 		context->flags |= CODEC_FLAG_GLOBAL_HEADER;
@@ -201,9 +234,13 @@
 	if (!open_video_codec(data))
 		return false;
 
-	if (context->pix_fmt != vformat)
+	if (context->pix_fmt    != data->config.format ||
+	    data->config.width  != data->config.scale_width ||
+	    data->config.height != data->config.scale_height) {
+
 		if (!init_swscale(data, context))
 			return false;
+	}
 
 	return true;
 }
@@ -211,8 +248,14 @@
 static bool open_audio_codec(struct ffmpeg_data *data)
 {
 	AVCodecContext *context = data->audio->codec;
+	char **opts = strlist_split(data->config.video_settings, ' ', false);
 	int ret;
 
+	if (opts) {
+		parse_params(context, opts);

obs-studio-0.8.2+git20150211.6099c65.tar.xz/plugins/obs-libfdk/data/locale/zh-CN.ini Added

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/plugins/obs-outputs/CMakeLists.txt -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/plugins/obs-outputs/CMakeLists.txt Changed

obs-studio-0.8.2+git20150211.6099c65.tar.xz/plugins/obs-outputs/data/locale/zh-CN.ini Added

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/plugins/obs-outputs/flv-mux.c -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/plugins/obs-outputs/flv-mux.c Changed

@@ -56,11 +56,11 @@
 	fwrite(buf, 1, enc - buf, file);
 }
 
-static void build_flv_meta_data(obs_output_t *context,
-		uint8_t **output, size_t *size)
+static bool build_flv_meta_data(obs_output_t *context,
+		uint8_t **output, size_t *size, size_t a_idx)
 {
 	obs_encoder_t *vencoder = obs_output_get_video_encoder(context);
-	obs_encoder_t *aencoder = obs_output_get_audio_encoder(context);
+	obs_encoder_t *aencoder = obs_output_get_audio_encoder(context, a_idx);
 	video_t       *video    = obs_encoder_video(vencoder);
 	audio_t       *audio    = obs_encoder_audio(aencoder);
 	char buf[4096];
@@ -68,22 +68,29 @@
 	char *end = enc+sizeof(buf);
 	struct dstr encoder_name = {0};
 
+	if (a_idx > 0 && !aencoder)
+		return false;
+
 	enc_str(&enc, end, "onMetaData");
 
 	*enc++ = AMF_ECMA_ARRAY;
-	enc    = AMF_EncodeInt32(enc, end, 14);
+	enc    = AMF_EncodeInt32(enc, end, a_idx == 0 ? 14 : 9);
 
 	enc_num_val(&enc, end, "duration", 0.0);
 	enc_num_val(&enc, end, "fileSize", 0.0);
 
-	enc_num_val(&enc, end, "width",
-			(double)obs_encoder_get_width(vencoder));
-	enc_num_val(&enc, end, "height",
-			(double)obs_encoder_get_height(vencoder));
-
-	enc_str_val(&enc, end, "videocodecid", "avc1");
-	enc_num_val(&enc, end, "videodatarate", encoder_bitrate(vencoder));
-	enc_num_val(&enc, end, "framerate", video_output_get_frame_rate(video));
+	if (a_idx == 0) {
+		enc_num_val(&enc, end, "width",
+				(double)obs_encoder_get_width(vencoder));
+		enc_num_val(&enc, end, "height",
+				(double)obs_encoder_get_height(vencoder));
+
+		enc_str_val(&enc, end, "videocodecid", "avc1");
+		enc_num_val(&enc, end, "videodatarate",
+				encoder_bitrate(vencoder));
+		enc_num_val(&enc, end, "framerate",
+				video_output_get_frame_rate(video));
+	}
 
 	enc_str_val(&enc, end, "audiocodecid", "mp4a");
 	enc_num_val(&enc, end, "audiodatarate", encoder_bitrate(aencoder));
@@ -119,20 +126,25 @@
 
 	*size   = enc-buf;
 	*output = bmemdup(buf, *size);
+	return true;
 }
 
-void flv_meta_data(obs_output_t *context, uint8_t **output, size_t *size,
-		bool write_header)
+bool flv_meta_data(obs_output_t *context, uint8_t **output, size_t *size,
+		bool write_header, size_t audio_idx)
 {
 	struct array_output_data data;
 	struct serializer s;
-	uint8_t *meta_data;
+	uint8_t *meta_data = NULL;
 	size_t  meta_data_size;
 	uint32_t start_pos;
 
 	array_output_serializer_init(&s, &data);
 
-	build_flv_meta_data(context, &meta_data, &meta_data_size);
+	if (!build_flv_meta_data(context, &meta_data, &meta_data_size,
+				audio_idx)) {
+		bfree(meta_data);
+		return false;
+	}
 
 	if (write_header) {
 		s_write(&s, "FLV", 3);
@@ -158,6 +170,7 @@
 	*size   = data.bytes.num;
 
 	bfree(meta_data);
+	return true;
 }
 
 #ifdef DEBUG_TIMESTAMPS

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/plugins/obs-outputs/flv-mux.h -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/plugins/obs-outputs/flv-mux.h Changed

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/plugins/obs-outputs/flv-output.c -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/plugins/obs-outputs/flv-output.c Changed

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/plugins/obs-outputs/librtmp/amf.c -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/plugins/obs-outputs/librtmp/amf.c Changed

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/plugins/obs-outputs/librtmp/hashswf.c -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/plugins/obs-outputs/librtmp/hashswf.c Changed

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/plugins/obs-outputs/librtmp/parseurl.c -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/plugins/obs-outputs/librtmp/parseurl.c Changed

@@ -25,180 +25,9 @@
 #include "log.h"
 
 int RTMP_ParseURL(const char *url, int *protocol, AVal *host, unsigned int *port,
-                  AVal *playpath, AVal *app)
-{
-    char *p, *end, *col, *ques, *slash;
-
-    RTMP_Log(RTMP_LOGDEBUG, "Parsing...");
-
-    *protocol = RTMP_PROTOCOL_RTMP;
-    *port = 0;
-    playpath->av_len = 0;
-    playpath->av_val = NULL;
-    app->av_len = 0;
-    app->av_val = NULL;
-
-    /* Old School Parsing */
-
-    /* look for usual :// pattern */
-    p = strstr(url, "://");
-    if(!p)
-    {
-        RTMP_Log(RTMP_LOGERROR, "RTMP URL: No :// in url!");
-        return FALSE;
-    }
-    {
-        int len = (int)(p-url);
-
-        if(len == 4 && strncasecmp(url, "rtmp", 4)==0)
-            *protocol = RTMP_PROTOCOL_RTMP;
-        else if(len == 5 && strncasecmp(url, "rtmpt", 5)==0)
-            *protocol = RTMP_PROTOCOL_RTMPT;
-        else if(len == 5 && strncasecmp(url, "rtmps", 5)==0)
-            *protocol = RTMP_PROTOCOL_RTMPS;
-        else if(len == 5 && strncasecmp(url, "rtmpe", 5)==0)
-            *protocol = RTMP_PROTOCOL_RTMPE;
-        else if(len == 5 && strncasecmp(url, "rtmfp", 5)==0)
-            *protocol = RTMP_PROTOCOL_RTMFP;
-        else if(len == 6 && strncasecmp(url, "rtmpte", 6)==0)
-            *protocol = RTMP_PROTOCOL_RTMPTE;
-        else if(len == 6 && strncasecmp(url, "rtmpts", 6)==0)
-            *protocol = RTMP_PROTOCOL_RTMPTS;
-        else
-        {
-            RTMP_Log(RTMP_LOGWARNING, "Unknown protocol!\n");
-            goto parsehost;
-        }
-    }
-
-    RTMP_Log(RTMP_LOGDEBUG, "Parsed protocol: %d", *protocol);
-
-parsehost:
-    /* let's get the hostname */
-    p+=3;
-
-    /* check for sudden death */
-    if(*p==0)
-    {
-        RTMP_Log(RTMP_LOGWARNING, "No hostname in URL!");
-        return FALSE;
-    }
-
-    end   = p + strlen(p);
-    col   = strchr(p, ':');
-    ques  = strchr(p, '?');
-    slash = strchr(p, '/');
-
-    {
-        int hostlen;
-        if(slash)
-            hostlen = slash - p;
-        else
-            hostlen = end - p;
-        if(col && col -p < hostlen)
-            hostlen = col - p;
-
-        if(hostlen < 256)
-        {
-            host->av_val = p;
-            host->av_len = hostlen;
-            RTMP_Log(RTMP_LOGDEBUG, "Parsed host    : %.*s", hostlen, host->av_val);
-        }
-        else
-        {
-            RTMP_Log(RTMP_LOGWARNING, "Hostname exceeds 255 characters!");
-        }
-
-        p+=hostlen;
-    }
-
-    /* get the port number if available */
-    if(*p == ':')
-    {
-        unsigned int p2;
-        p++;
-        p2 = atoi(p);
-        if(p2 > 65535)
-        {
-            RTMP_Log(RTMP_LOGWARNING, "Invalid port number!");
-        }
-        else
-        {
-            *port = p2;
-        }
-    }
-
-    if(!slash)
-    {
-        RTMP_Log(RTMP_LOGWARNING, "No application or playpath in URL!");
-        return TRUE;
-    }
-    p = slash+1;
-
-    {
-        /* parse application
-         *
-         * rtmp://host[:port]/app[/appinstance][/...]
-         * application = app[/appinstance]
-         */
-
-        char *slash2, *slash3 = NULL, *slash4 = NULL;
-        int applen, appnamelen;
-
-        slash2 = strchr(p, '/');
-        if(slash2)
-            slash3 = strchr(slash2+1, '/');
-        if(slash3)
-            slash4 = strchr(slash3+1, '/');
-
-        applen = end-p; /* ondemand, pass all parameters as app */
-        appnamelen = applen; /* ondemand length */
-
-        if(ques && strstr(p, "slist="))   /* whatever it is, the '?' and slist= means we need to use everything as app and parse plapath from slist= */
-        {
-            appnamelen = ques-p;
-        }
-        else if(strncmp(p, "ondemand/", 9)==0)
-        {
-            /* app = ondemand/foobar, only pass app=ondemand */
-            applen = 8;
-            appnamelen = 8;
-        }
-        else   /* app!=ondemand, so app is app[/appinstance] */
-        {
-            if(slash4)
-                appnamelen = slash4-p;
-            else if(slash3)
-                appnamelen = slash3-p;
-            else if(slash2)
-                appnamelen = slash2-p;
-
-            applen = appnamelen;
-        }
-
-        app->av_val = p;
-        app->av_len = applen;
-        RTMP_Log(RTMP_LOGDEBUG, "Parsed app     : %.*s", applen, p);
-
-        p += appnamelen;
-    }
-
-    if (*p == '/')
-        p++;
-
-    if (end-p)
-    {
-        AVal av = {p, end-p};
-        RTMP_ParsePlaypath(&av, playpath);
-    }
-
-    return TRUE;
-}
-
-int RTMP_ParseURL2(const char *url, int *protocol, AVal *host, unsigned int *port,
                   AVal *app)
 {
-    char *p, *end, *col, /* *ques, */ *slash;
+    char *p, *end, *col, /* *ques, */ *slash, *v6;
 
     RTMP_Log(RTMP_LOGDEBUG, "Parsing...");
 
@@ -254,9 +83,10 @@
     }
 
     end   = p + strlen(p);
-    col   = strchr(p, ':');
+    v6    = strchr(p, ']');
     // ques  = strchr(p, '?');
     slash = strchr(p, '/');
+    col   = strchr((v6 && v6 < slash) ? v6 : p, ':');
 
     {
         int hostlen;

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/plugins/obs-outputs/librtmp/rtmp.c -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/plugins/obs-outputs/librtmp/rtmp.c Changed

@@ -115,10 +115,10 @@
 static int SendCheckBWResult(RTMP *r, double txn);
 static int SendDeleteStream(RTMP *r, double dStreamId);
 static int SendFCSubscribe(RTMP *r, AVal *subscribepath);
-static int SendPlay(RTMP *r);
+static int SendPlay(RTMP *r, int streamIdx);
 static int SendBytesReceived(RTMP *r);
 static int SendUsherToken(RTMP *r, AVal *usherToken);
-static int SendFCUnpublish(RTMP *r);
+static int SendFCUnpublish(RTMP *r, int streamIdx);
 
 #if 0				/* unused */
 static int SendBGHasStream(RTMP *r, double dId, AVal *playpath);
@@ -379,6 +379,8 @@
     r->m_nServerBW = 2500000;
     r->m_fAudioCodecs = 3191.0;
     r->m_fVideoCodecs = 252.0;
+    r->Link.curStreamIdx = 0;
+    r->Link.nStreams = 0;
     r->Link.timeout = 30;
     r->Link.swfAge = 30;
 }
@@ -398,7 +400,7 @@
 int
 RTMP_IsConnected(RTMP *r)
 {
-    return r->m_sb.sb_socket != -1;
+    return r->m_sb.sb_socket != INVALID_SOCKET;
 }
 
 SOCKET
@@ -467,244 +469,6 @@
     }
 }
 
-void
-RTMP_SetupStream(RTMP *r,
-                 int protocol,
-                 AVal *host,
-                 unsigned int port,
-                 AVal *sockshost,
-                 AVal *playpath,
-                 AVal *tcUrl,
-                 AVal *swfUrl,
-                 AVal *pageUrl,
-                 AVal *app,
-                 AVal *auth,
-                 AVal *swfSHA256Hash,
-                 uint32_t swfSize,
-                 AVal *flashVer,
-                 AVal *subscribepath,
-                 AVal *usherToken,
-                 int dStart,
-                 int dStop, int bLiveStream, long int timeout)
-{
-    RTMP_Log(RTMP_LOGDEBUG, "Protocol : %s", RTMPProtocolStrings[protocol&7]);
-    RTMP_Log(RTMP_LOGDEBUG, "Hostname : %.*s", host->av_len, host->av_val);
-    RTMP_Log(RTMP_LOGDEBUG, "Port     : %d", port);
-    RTMP_Log(RTMP_LOGDEBUG, "Playpath : %s", playpath->av_val);
-
-    if (tcUrl && tcUrl->av_val)
-        RTMP_Log(RTMP_LOGDEBUG, "tcUrl    : %s", tcUrl->av_val);
-    if (swfUrl && swfUrl->av_val)
-        RTMP_Log(RTMP_LOGDEBUG, "swfUrl   : %s", swfUrl->av_val);
-    if (pageUrl && pageUrl->av_val)
-        RTMP_Log(RTMP_LOGDEBUG, "pageUrl  : %s", pageUrl->av_val);
-    if (app && app->av_val)
-        RTMP_Log(RTMP_LOGDEBUG, "app      : %.*s", app->av_len, app->av_val);
-    if (auth && auth->av_val)
-        RTMP_Log(RTMP_LOGDEBUG, "auth     : %s", auth->av_val);
-    if (subscribepath && subscribepath->av_val)
-        RTMP_Log(RTMP_LOGDEBUG, "subscribepath : %s", subscribepath->av_val);
-    if (usherToken && usherToken->av_val)
-        RTMP_Log(RTMP_LOGDEBUG, "NetStream.Authenticate.UsherToken : %s", usherToken->av_val);
-    if (flashVer && flashVer->av_val)
-        RTMP_Log(RTMP_LOGDEBUG, "flashVer : %s", flashVer->av_val);
-    if (dStart > 0)
-        RTMP_Log(RTMP_LOGDEBUG, "StartTime     : %d msec", dStart);
-    if (dStop > 0)
-        RTMP_Log(RTMP_LOGDEBUG, "StopTime      : %d msec", dStop);
-
-    RTMP_Log(RTMP_LOGDEBUG, "live     : %s", bLiveStream ? "yes" : "no");
-    RTMP_Log(RTMP_LOGDEBUG, "timeout  : %ld sec", timeout);
-
-#ifdef CRYPTO
-    if (swfSHA256Hash != NULL && swfSize > 0)
-    {
-        memcpy(r->Link.SWFHash, swfSHA256Hash->av_val, sizeof(r->Link.SWFHash));
-        r->Link.SWFSize = swfSize;
-        RTMP_Log(RTMP_LOGDEBUG, "SWFSHA256:");
-        RTMP_LogHex(RTMP_LOGDEBUG, r->Link.SWFHash, sizeof(r->Link.SWFHash));
-        RTMP_Log(RTMP_LOGDEBUG, "SWFSize  : %u", r->Link.SWFSize);
-    }
-    else
-    {
-        r->Link.SWFSize = 0;
-    }
-
-#else
-    (void)swfSHA256Hash;
-    (void)swfSize;
-#endif
-
-    SocksSetup(r, sockshost);
-
-    if (tcUrl && tcUrl->av_len)
-        r->Link.tcUrl = *tcUrl;
-    if (swfUrl && swfUrl->av_len)
-        r->Link.swfUrl = *swfUrl;
-    if (pageUrl && pageUrl->av_len)
-        r->Link.pageUrl = *pageUrl;
-    if (app && app->av_len)
-        r->Link.app = *app;
-    if (auth && auth->av_len)
-    {
-        r->Link.auth = *auth;
-        r->Link.lFlags |= RTMP_LF_AUTH;
-    }
-    if (flashVer && flashVer->av_len)
-        r->Link.flashVer = *flashVer;
-    else
-        r->Link.flashVer = RTMP_DefaultFlashVer;
-    if (subscribepath && subscribepath->av_len)
-        r->Link.subscribepath = *subscribepath;
-    if (usherToken && usherToken->av_len)
-        r->Link.usherToken = *usherToken;
-    r->Link.seekTime = dStart;
-    r->Link.stopTime = dStop;
-    if (bLiveStream)
-        r->Link.lFlags |= RTMP_LF_LIVE;
-    r->Link.timeout = timeout;
-
-    r->Link.protocol = protocol;
-    r->Link.hostname = *host;
-    r->Link.port = port;
-    r->Link.playpath = *playpath;
-
-    if (r->Link.port == 0)
-    {
-        if (protocol & RTMP_FEATURE_SSL)
-            r->Link.port = 443;
-        else if (protocol & RTMP_FEATURE_HTTP)
-            r->Link.port = 80;
-        else
-            r->Link.port = 1935;
-    }
-}
-
-enum { OPT_STR=0, OPT_INT, OPT_BOOL, OPT_CONN };
-static const char *optinfo[] =
-{
-    "string", "integer", "boolean", "AMF"
-};
-
-#define OFF(x)	offsetof(struct RTMP,x)
-
-static struct urlopt
-{
-    AVal name;
-    off_t off;
-    int otype;
-    int omisc;
-    char *use;
-} options[] =
-{
-    {
-        AVC("socks"),     OFF(Link.sockshost),     OPT_STR, 0,
-        "Use the specified SOCKS proxy"
-    },
-    {
-        AVC("app"),       OFF(Link.app),           OPT_STR, 0,
-        "Name of target app on server"
-    },
-    {
-        AVC("tcUrl"),     OFF(Link.tcUrl),         OPT_STR, 0,
-        "URL to played stream"
-    },
-    {
-        AVC("pageUrl"),   OFF(Link.pageUrl),       OPT_STR, 0,
-        "URL of played media's web page"
-    },
-    {
-        AVC("swfUrl"),    OFF(Link.swfUrl),        OPT_STR, 0,
-        "URL to player SWF file"
-    },
-    {
-        AVC("flashver"),  OFF(Link.flashVer),      OPT_STR, 0,
-        "Flash version string (default " DEF_VERSTR ")"
-    },
-    {
-        AVC("conn"),      OFF(Link.extras),        OPT_CONN, 0,
-        "Append arbitrary AMF data to Connect message"
-    },
-    {
-        AVC("playpath"),  OFF(Link.playpath),      OPT_STR, 0,
-        "Path to target media on server"
-    },
-    {
-        AVC("playlist"),  OFF(Link.lFlags),        OPT_BOOL, RTMP_LF_PLST,
-        "Set playlist before play command"

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/plugins/obs-outputs/librtmp/rtmp.h -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/plugins/obs-outputs/librtmp/rtmp.h Changed

@@ -37,9 +37,12 @@
 #include <stdint.h>
 
 #ifdef _WIN32
+#ifdef _MSC_VER
 #pragma warning(disable:4996) //depricated warnings
 #pragma warning(disable:4244) //64bit defensive mechanism, fixed the ones that mattered
-#include <winsock.h>
+#endif
+#include <winsock2.h>
+#include <ws2tcpip.h>
 #else
 #include <sys/socket.h>
 #include <netinet/in.h>
@@ -154,13 +157,22 @@
 
 #define RTMPPacket_IsReady(a)	((a)->m_nBytesRead == (a)->m_nBodySize)
 
+    typedef struct RTMP_Stream {
+        int id;
+        AVal playpath;
+    } RTMP_Stream;
+
     typedef struct RTMP_LNK
     {
+#define RTMP_MAX_STREAMS 8
+        RTMP_Stream streams[RTMP_MAX_STREAMS];
+        int nStreams;
+        int curStreamIdx;
+        int playingStreams;
+
         AVal hostname;
         AVal sockshost;
 
-        AVal playpath0;	/* parsed from URL */
-        AVal playpath;	/* passed in explicitly */
         AVal tcUrl;
         AVal swfUrl;
         AVal pageUrl;
@@ -253,7 +265,7 @@
 
     typedef struct RTMP_BINDINFO
     {
-        struct sockaddr_in addr;
+        struct sockaddr_storage addr;
         int addrLen;
     } RTMP_BINDINFO;
 
@@ -317,9 +329,6 @@
     } RTMP;
 
     int RTMP_ParseURL(const char *url, int *protocol, AVal *host,
-                      unsigned int *port, AVal *playpath, AVal *app);
-
-    int RTMP_ParseURL2(const char *url, int *protocol, AVal *host,
                       unsigned int *port, AVal *app);
 
     void RTMP_ParsePlaypath(AVal *in, AVal *out);
@@ -328,7 +337,7 @@
 
     int RTMP_SetOpt(RTMP *r, const AVal *opt, AVal *arg);
     int RTMP_SetupURL(RTMP *r, char *url);
-    int RTMP_SetupURL2(RTMP *r, char *url, char *playpath);
+    int RTMP_AddStream(RTMP *r, const char *playpath);
     void RTMP_SetupStream(RTMP *r, int protocol,
                           AVal *hostname,
                           unsigned int port,
@@ -349,7 +358,7 @@
 
     int RTMP_Connect(RTMP *r, RTMPPacket *cp);
     struct sockaddr;
-    int RTMP_Connect0(RTMP *r, struct sockaddr *svc);
+    int RTMP_Connect0(RTMP *r, struct sockaddr *svc, socklen_t addrlen);
     int RTMP_Connect1(RTMP *r, RTMPPacket *cp);
     int RTMP_Serve(RTMP *r);
     int RTMP_TLS_Accept(RTMP *r, void *ctx);
@@ -364,8 +373,8 @@
     int RTMP_ToggleStream(RTMP *r);
 
     int RTMP_ConnectStream(RTMP *r, int seekTime);
-    int RTMP_ReconnectStream(RTMP *r, int seekTime);
-    void RTMP_DeleteStream(RTMP *r);
+    int RTMP_ReconnectStream(RTMP *r, int seekTime, int streamIdx);
+    void RTMP_DeleteStream(RTMP *r, int streamIdx);
     int RTMP_GetNextMediaPacket(RTMP *r, RTMPPacket *packet);
     int RTMP_ClientPacket(RTMP *r, RTMPPacket *packet);
 
@@ -403,7 +412,7 @@
     int RTMP_SendClientBW(RTMP *r);
     void RTMP_DropRequest(RTMP *r, int i, int freeit);
     int RTMP_Read(RTMP *r, char *buf, int size);
-    int RTMP_Write(RTMP *r, const char *buf, int size);
+    int RTMP_Write(RTMP *r, const char *buf, int size, int streamIdx);
 
     /* hashswf.c */
     int RTMP_HashSWF(const char *url, unsigned int *size, unsigned char *hash,

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/plugins/obs-outputs/librtmp/rtmp_sys.h -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/plugins/obs-outputs/librtmp/rtmp_sys.h Changed

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/plugins/obs-outputs/rtmp-helpers.h -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/plugins/obs-outputs/rtmp-helpers.h Changed

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/plugins/obs-outputs/rtmp-stream.c -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/plugins/obs-outputs/rtmp-stream.c Changed

@@ -191,7 +191,7 @@
 }
 
 static int send_packet(struct rtmp_stream *stream,
-		struct encoder_packet *packet, bool is_header)
+		struct encoder_packet *packet, bool is_header, size_t idx)
 {
 	uint8_t *data;
 	size_t  size;
@@ -201,7 +201,7 @@
 #ifdef TEST_FRAMEDROPS
 	os_sleep_ms(rand() % 40);
 #endif
-	ret = RTMP_Write(&stream->rtmp, (char*)data, (int)size);
+	ret = RTMP_Write(&stream->rtmp, (char*)data, (int)size, (int)idx);
 	bfree(data);
 
 	obs_free_encoder_packet(packet);
@@ -220,7 +220,7 @@
 		send_headers(stream);
 
 	while (get_next_packet(stream, &packet))
-		if (send_packet(stream, &packet, false) < 0)
+		if (send_packet(stream, &packet, false, packet.track_idx) < 0)
 			return false;
 
 	return true;
@@ -242,7 +242,7 @@
 		if (!stream->sent_headers)
 			send_headers(stream);
 
-		if (send_packet(stream, &packet, false) < 0) {
+		if (send_packet(stream, &packet, false, packet.track_idx) < 0) {
 			disconnected = true;
 			break;
 		}
@@ -267,20 +267,26 @@
 	return NULL;
 }
 
-static void send_meta_data(struct rtmp_stream *stream)
+static bool send_meta_data(struct rtmp_stream *stream, size_t idx)
 {
 	uint8_t *meta_data;
 	size_t  meta_data_size;
+	bool success = flv_meta_data(stream->output, &meta_data,
+			&meta_data_size, false, idx);
 
-	flv_meta_data(stream->output, &meta_data, &meta_data_size, false);
-	RTMP_Write(&stream->rtmp, (char*)meta_data, (int)meta_data_size);
-	bfree(meta_data);
+	if (success) {
+		RTMP_Write(&stream->rtmp, (char*)meta_data,
+				(int)meta_data_size, (int)idx);
+		bfree(meta_data);
+	}
+
+	return success;
 }
 
-static void send_audio_header(struct rtmp_stream *stream)
+static bool send_audio_header(struct rtmp_stream *stream, size_t idx)
 {
 	obs_output_t  *context  = stream->output;
-	obs_encoder_t *aencoder = obs_output_get_audio_encoder(context);
+	obs_encoder_t *aencoder = obs_output_get_audio_encoder(context, idx);
 	uint8_t       *header;
 
 	struct encoder_packet packet   = {
@@ -288,9 +294,13 @@
 		.timebase_den = 1
 	};
 
+	if (!aencoder)
+		return false;
+
 	obs_encoder_get_extra_data(aencoder, &header, &packet.size);
 	packet.data = bmemdup(header, packet.size);
-	send_packet(stream, &packet, true);
+	send_packet(stream, &packet, true, idx);
+	return true;
 }
 
 static void send_video_header(struct rtmp_stream *stream)
@@ -308,14 +318,18 @@
 
 	obs_encoder_get_extra_data(vencoder, &header, &size);
 	packet.size = obs_parse_avc_header(&packet.data, header, size);
-	send_packet(stream, &packet, true);
+	send_packet(stream, &packet, true, 0);
 }
 
 static inline void send_headers(struct rtmp_stream *stream)
 {
 	stream->sent_headers = true;
-	send_audio_header(stream);
+	size_t i = 0;
+
+	send_audio_header(stream, i++);
 	send_video_header(stream);
+
+	while (send_audio_header(stream, i++));
 }
 
 static inline bool reset_semaphore(struct rtmp_stream *stream)
@@ -348,6 +362,7 @@
 static int init_send(struct rtmp_stream *stream)
 {
 	int ret;
+	size_t idx = 0;
 
 #if defined(_WIN32)
 	adjust_sndbuf_size(stream, MIN_SENDBUF_SIZE);
@@ -363,7 +378,7 @@
 	}
 
 	stream->active = true;
-	send_meta_data(stream);
+	while (send_meta_data(stream, idx++));
 	obs_output_begin_data_capture(stream->output, 0);
 
 	return OBS_OUTPUT_SUCCESS;
@@ -378,8 +393,7 @@
 
 	info("Connecting to RTMP URL %s...", stream->path.array);
 
-	if (!RTMP_SetupURL2(&stream->rtmp, stream->path.array,
-				stream->key.array))
+	if (!RTMP_SetupURL(&stream->rtmp, stream->path.array))
 		return OBS_OUTPUT_BAD_PATH;
 
 	RTMP_EnableWrite(&stream->rtmp);
@@ -390,6 +404,20 @@
 	set_rtmp_str(&stream->rtmp.Link.flashVer,
 			"FMLE/3.0 (compatible; FMSc/1.0)");
 
+	RTMP_AddStream(&stream->rtmp, stream->key.array);
+
+	for (size_t idx = 1;; idx++) {
+		obs_encoder_t *encoder = obs_output_get_audio_encoder(
+				stream->output, idx);
+		const char *encoder_name;
+
+		if (!encoder)
+			break;
+
+		encoder_name = obs_encoder_get_name(encoder);
+		RTMP_AddStream(&stream->rtmp, encoder_name);
+	}
+
 	stream->rtmp.m_outChunkSize       = 4096;
 	stream->rtmp.m_bSendChunkSizeInfo = true;
 	stream->rtmp.m_bUseNagle          = true;
@@ -600,7 +628,8 @@
 	.id                 = "rtmp_output",
 	.flags              = OBS_OUTPUT_AV |
 	                      OBS_OUTPUT_ENCODED |
-	                      OBS_OUTPUT_SERVICE,
+	                      OBS_OUTPUT_SERVICE |
+	                      OBS_OUTPUT_MULTI_TRACK,
 	.get_name           = rtmp_stream_getname,
 	.create             = rtmp_stream_create,
 	.destroy            = rtmp_stream_destroy,
@@ -611,4 +640,4 @@
 	.get_properties     = rtmp_stream_properties,
 	.get_total_bytes    = rtmp_stream_total_bytes_sent,
 	.get_dropped_frames = rtmp_stream_dropped_frames
-};         
+};

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/plugins/obs-x264/data/locale/ar-SA.ini -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/plugins/obs-x264/data/locale/ar-SA.ini Changed

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/plugins/obs-x264/data/locale/bg-BG.ini -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/plugins/obs-x264/data/locale/bg-BG.ini Changed

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/plugins/obs-x264/data/locale/da-DK.ini -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/plugins/obs-x264/data/locale/da-DK.ini Changed

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/plugins/obs-x264/data/locale/de-DE.ini -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/plugins/obs-x264/data/locale/de-DE.ini Changed

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/plugins/obs-x264/data/locale/el-GR.ini -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/plugins/obs-x264/data/locale/el-GR.ini Changed

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/plugins/obs-x264/data/locale/en-US.ini -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/plugins/obs-x264/data/locale/en-US.ini Changed

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/plugins/obs-x264/data/locale/es-ES.ini -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/plugins/obs-x264/data/locale/es-ES.ini Changed

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/plugins/obs-x264/data/locale/eu-ES.ini -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/plugins/obs-x264/data/locale/eu-ES.ini Changed

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/plugins/obs-x264/data/locale/fi-FI.ini -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/plugins/obs-x264/data/locale/fi-FI.ini Changed

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/plugins/obs-x264/data/locale/fr-FR.ini -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/plugins/obs-x264/data/locale/fr-FR.ini Changed

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/plugins/obs-x264/data/locale/gl-ES.ini -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/plugins/obs-x264/data/locale/gl-ES.ini Changed

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/plugins/obs-x264/data/locale/hr-HR.ini -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/plugins/obs-x264/data/locale/hr-HR.ini Changed

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/plugins/obs-x264/data/locale/hu-HU.ini -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/plugins/obs-x264/data/locale/hu-HU.ini Changed

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/plugins/obs-x264/data/locale/it-IT.ini -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/plugins/obs-x264/data/locale/it-IT.ini Changed

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/plugins/obs-x264/data/locale/ja-JP.ini -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/plugins/obs-x264/data/locale/ja-JP.ini Changed

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/plugins/obs-x264/data/locale/ko-KR.ini -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/plugins/obs-x264/data/locale/ko-KR.ini Changed

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/plugins/obs-x264/data/locale/nb-NO.ini -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/plugins/obs-x264/data/locale/nb-NO.ini Changed

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/plugins/obs-x264/data/locale/nl-NL.ini -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/plugins/obs-x264/data/locale/nl-NL.ini Changed

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/plugins/obs-x264/data/locale/pl-PL.ini -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/plugins/obs-x264/data/locale/pl-PL.ini Changed

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/plugins/obs-x264/data/locale/pt-BR.ini -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/plugins/obs-x264/data/locale/pt-BR.ini Changed

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/plugins/obs-x264/data/locale/pt-PT.ini -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/plugins/obs-x264/data/locale/pt-PT.ini Changed

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/plugins/obs-x264/data/locale/ro-RO.ini -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/plugins/obs-x264/data/locale/ro-RO.ini Changed

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/plugins/obs-x264/data/locale/ru-RU.ini -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/plugins/obs-x264/data/locale/ru-RU.ini Changed

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/plugins/obs-x264/data/locale/sk-SK.ini -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/plugins/obs-x264/data/locale/sk-SK.ini Changed

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/plugins/obs-x264/data/locale/sl-SI.ini -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/plugins/obs-x264/data/locale/sl-SI.ini Changed

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/plugins/obs-x264/data/locale/sr-CS.ini -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/plugins/obs-x264/data/locale/sr-CS.ini Changed

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/plugins/obs-x264/data/locale/sr-SP.ini -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/plugins/obs-x264/data/locale/sr-SP.ini Changed

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/plugins/obs-x264/data/locale/sv-SE.ini -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/plugins/obs-x264/data/locale/sv-SE.ini Changed

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/plugins/obs-x264/data/locale/tr-TR.ini -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/plugins/obs-x264/data/locale/tr-TR.ini Changed

obs-studio-0.8.2+git20150211.6099c65.tar.xz/plugins/obs-x264/data/locale/zh-CN.ini Added

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/plugins/obs-x264/data/locale/zh-TW.ini -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/plugins/obs-x264/data/locale/zh-TW.ini Changed

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/plugins/obs-x264/obs-x264.c -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/plugins/obs-x264/obs-x264.c Changed

@@ -90,11 +90,12 @@
 
 static void obs_x264_defaults(obs_data_t *settings)
 {
-	obs_data_set_default_int   (settings, "bitrate",     1000);
-	obs_data_set_default_int   (settings, "buffer_size", 1000);
+	obs_data_set_default_int   (settings, "bitrate",     2500);
+	obs_data_set_default_bool  (settings, "use_bufsize", false);
+	obs_data_set_default_int   (settings, "buffer_size", 2500);
 	obs_data_set_default_int   (settings, "keyint_sec",  0);
 	obs_data_set_default_int   (settings, "crf",         23);
-	obs_data_set_default_bool  (settings, "cbr",         false);
+	obs_data_set_default_bool  (settings, "cbr",         true);
 
 	obs_data_set_default_string(settings, "preset",      "veryfast");
 	obs_data_set_default_string(settings, "profile",     "");
@@ -111,24 +112,55 @@
 }
 
 #define TEXT_BITRATE    obs_module_text("Bitrate")
+#define TEXT_CUSTOM_BUF obs_module_text("CustomBufsize")
 #define TEXT_BUF_SIZE   obs_module_text("BufferSize")
+#define TEXT_USE_CBR    obs_module_text("UseCBR")
+#define TEXT_CRF        obs_module_text("CRF")
 #define TEXT_KEYINT_SEC obs_module_text("KeyframeIntervalSec")
 #define TEXT_PRESET     obs_module_text("CPUPreset")
 #define TEXT_PROFILE    obs_module_text("Profile")
 #define TEXT_TUNE       obs_module_text("Tune")
+#define TEXT_NONE       obs_module_text("None")
 #define TEXT_X264_OPTS  obs_module_text("EncoderOptions")
 
+static bool use_bufsize_modified(obs_properties_t *ppts, obs_property_t *p,
+		obs_data_t *settings)
+{
+	bool use_bufsize = obs_data_get_bool(settings, "use_bufsize");
+	p = obs_properties_get(ppts, "buffer_size");
+	obs_property_set_visible(p, use_bufsize);
+	return true;
+}
+
+static bool use_cbr_modified(obs_properties_t *ppts, obs_property_t *p,
+		obs_data_t *settings)
+{
+	bool cbr = obs_data_get_bool(settings, "cbr");
+	p = obs_properties_get(ppts, "crf");
+	obs_property_set_visible(p, !cbr);
+	return true;
+}
+
 static obs_properties_t *obs_x264_props(void *unused)
 {
 	UNUSED_PARAMETER(unused);
 
 	obs_properties_t *props = obs_properties_create();
 	obs_property_t *list;
+	obs_property_t *p;
+
+	obs_properties_add_int(props, "bitrate", TEXT_BITRATE, 50, 10000000, 1);
+
+	p = obs_properties_add_bool(props, "use_bufsize", TEXT_CUSTOM_BUF);
+	obs_property_set_modified_callback(p, use_bufsize_modified);
+	obs_properties_add_int(props, "buffer_size", TEXT_BUF_SIZE, 0,
+			10000000, 1);
 
-	obs_properties_add_int(props, "bitrate", TEXT_BITRATE, 50, 100000, 1);
-	obs_properties_add_int(props, "buffer_size", TEXT_BUF_SIZE, 50, 100000,
-			1);
 	obs_properties_add_int(props, "keyint_sec", TEXT_KEYINT_SEC, 0, 20, 1);
+	p = obs_properties_add_bool(props, "cbr", TEXT_USE_CBR);
+	obs_properties_add_int(props, "crf", TEXT_CRF, 0, 51, 1);
+
+	obs_property_set_modified_callback(p, use_cbr_modified);
 
 	list = obs_properties_add_list(props, "preset", TEXT_PRESET,
 			OBS_COMBO_TYPE_LIST, OBS_COMBO_FORMAT_STRING);
@@ -136,12 +168,14 @@
 
 	list = obs_properties_add_list(props, "profile", TEXT_PROFILE,
 			OBS_COMBO_TYPE_LIST, OBS_COMBO_FORMAT_STRING);
+	obs_property_list_add_string(list, TEXT_NONE, "");
 	obs_property_list_add_string(list, "baseline", "baseline");
 	obs_property_list_add_string(list, "main", "main");
 	obs_property_list_add_string(list, "high", "high");
 
 	list = obs_properties_add_list(props, "tune", TEXT_TUNE,
 			OBS_COMBO_TYPE_LIST, OBS_COMBO_FORMAT_STRING);
+	obs_property_list_add_string(list, TEXT_NONE, "");
 	add_strings(list, x264_tune_names);
 
 	obs_properties_add_text(props, "x264opts", TEXT_X264_OPTS,
@@ -324,12 +358,16 @@
 	int crf          = (int)obs_data_get_int(settings, "crf");
 	int width        = (int)obs_encoder_get_width(obsx264->encoder);
 	int height       = (int)obs_encoder_get_height(obsx264->encoder);
+	bool use_bufsize = obs_data_get_bool(settings, "use_bufsize");
 	bool cbr         = obs_data_get_bool(settings, "cbr");
 
 	if (keyint_sec)
 		obsx264->params.i_keyint_max =
 			keyint_sec * voi->fps_num / voi->fps_den;
 
+	if (!use_bufsize)
+		buffer_size = bitrate;
+
 	obsx264->params.b_vfr_input          = false;
 	obsx264->params.rc.i_vbv_max_bitrate = bitrate;
 	obsx264->params.rc.i_vbv_buffer_size = buffer_size;

obs-studio-0.8.2+git20150211.6099c65.tar.xz/plugins/rtmp-services/data/locale/zh-CN.ini Added

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/plugins/rtmp-services/data/services.json -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/plugins/rtmp-services/data/services.json Changed

@@ -7,10 +7,30 @@
                 "url": "rtmp://live.twitch.tv/app"
             },
             {
+                "name": "Asia: Hong Kong",
+                "url": "rtmp://live-hkg.twitch.tv/app"
+            },
+            {
+                "name": "Asia: Seoul, South Korea",
+                "url": "rtmp://live-sel.twitch.tv/app"
+            },
+            {
                 "name": "Asia: Singapore",
                 "url": "rtmp://live-sin-backup.twitch.tv/app"
             },
             {
+                "name": "Asia: Taipei, Taiwan",
+                "url": "rtmp://live-tpe.twitch.tv/app"
+            },
+            {
+                "name": "Asia: Tokyo, Japan",
+                "url": "rtmp://live-tyo.twitch.tv/app"
+            },
+            {
+                "name": "Australia: Sydney",
+                "url": "rtmp://live-syd.twitch.tv/app"
+            },
+            {
                 "name": "EU: Amsterdam, NL",
                 "url": "rtmp://live-ams.twitch.tv/app"
             },
@@ -91,36 +111,56 @@
                 "url": "rtmp://live.hitbox.tv/push"
             },
             {
-                "name": "EU-East",
+                "name": "EU-West: Frankfurt, Germany",
+                "url": "rtmp://live.fra.hitbox.tv/push"
+            },
+            {
+                "name": "EU-East: Vienna, Austria",
                 "url": "rtmp://live.vie.hitbox.tv/push"
             },
             {
-                "name": "EU-Central",
-                "url": "rtmp://live.nbg.hitbox.tv/push"
+                "name": "EU-North: London, United Kingdom",
+                "url": "rtmp://live.lhr.hitbox.tv/push"
             },
             {
-                "name": "EU-West",
-                "url": "rtmp://live.fra.hitbox.tv/push"
+                "name": "EU-Central: Nurnberg, Germany",
+                "url": "rtmp://live.nbg.hitbox.tv/push"
             },
             {
-                "name": "EU-North",
-                "url": "rtmp://live.ams.hitbox.tv/push"
+                "name": "Russia: Moscow",
+                "url": "rtmp://live.dme.hitbox.tv/push"
             },
             {
-                "name": "US-East",
+                "name": "US-East: Washington",
                 "url": "rtmp://live.vgn.hitbox.tv/push"
             },
             {
-                "name": "US-West",
+                "name": "US-Central: Denver",
+                "url": "rtmp://live.den.hitbox.tv/push"
+            },
+            {
+                "name": "US-West: Los Angeles",
                 "url": "rtmp://live.lax.hitbox.tv/push"
             },
             {
-                "name": "South America",
+                "name": "South America: Sao Paulo, Brazil",
                 "url": "rtmp://live.gru.hitbox.tv/push"
             },
             {
-                "name": "Asia",
+                "name": "South Korea: Seoul",
+                "url": "rtmp://live.icn.hitbox.tv/push"
+            },
+            {
+                "name": "Asia: Singapore",
                 "url": "rtmp://live.lax.hitbox.tv/push"
+            },
+            {
+                "name": "China: Hong Kong",
+                "url": "rtmp://live.hkg.hitbox.tv/push"
+            },
+            {
+                "name": "Oceania: Sydney, Australia",
+                "url": "rtmp://live.syd.hitbox.tv/push"
             }
         ],
         "recommended": {

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/plugins/rtmp-services/rtmp-common.c -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/plugins/rtmp-services/rtmp-common.c Changed

@@ -277,11 +277,9 @@
 	obs_data_release(settings);
 }
 
-static void initialize_output(struct rtmp_common *service, obs_output_t *output,
-		json_t *root)
+static void initialize_output(struct rtmp_common *service, json_t *root,
+		obs_encoder_t *video_encoder, obs_encoder_t *audio_encoder)
 {
-	obs_encoder_t *video_encoder = obs_output_get_video_encoder(output);
-	obs_encoder_t *audio_encoder = obs_output_get_audio_encoder(output);
 	json_t        *json_service = find_service(root, service->service);
 	json_t        *recommended;
 
@@ -302,7 +300,8 @@
 		apply_audio_encoder_settings(audio_encoder, recommended);
 }
 
-static bool rtmp_common_initialize(void *data, obs_output_t *output)
+static void rtmp_common_apply_settings(void *data,
+		obs_encoder_t *video_encoder, obs_encoder_t *audio_encoder)
 {
 	struct rtmp_common *service = data;
 	char               *file;
@@ -311,13 +310,12 @@
 	if (file) {
 		json_t *root = open_json_file(file);
 		if (root) {
-			initialize_output(service, output, root);
+			initialize_output(service, root, video_encoder,
+					audio_encoder);
 			json_decref(root);
 		}
 		bfree(file);
 	}
-
-	return true;
 }
 
 static const char *rtmp_common_url(void *data)
@@ -338,8 +336,8 @@
 	.create         = rtmp_common_create,
 	.destroy        = rtmp_common_destroy,
 	.update         = rtmp_common_update,
-	.initialize     = rtmp_common_initialize,
 	.get_properties = rtmp_common_properties,
 	.get_url        = rtmp_common_url,
-	.get_key        = rtmp_common_key
+	.get_key        = rtmp_common_key,
+	.apply_encoder_settings = rtmp_common_apply_settings,
 };

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/plugins/text-freetype2/data/locale/de-DE.ini -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/plugins/text-freetype2/data/locale/de-DE.ini Changed

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/plugins/text-freetype2/data/locale/fi-FI.ini -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/plugins/text-freetype2/data/locale/fi-FI.ini Changed

obs-studio-0.8.2+git20150211.6099c65.tar.xz/plugins/text-freetype2/data/locale/zh-CN.ini Added

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/plugins/text-freetype2/find-font-windows.c -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/plugins/text-freetype2/find-font-windows.c Changed

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/plugins/win-capture/CMakeLists.txt -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/plugins/win-capture/CMakeLists.txt Changed

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/plugins/win-capture/cursor-capture.c -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/plugins/win-capture/cursor-capture.c Changed

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/plugins/win-capture/d3d8-api/d3d8types.h -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/plugins/win-capture/d3d8-api/d3d8types.h Changed

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/plugins/win-capture/data/locale/da-DK.ini -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/plugins/win-capture/data/locale/da-DK.ini Changed

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/plugins/win-capture/data/locale/de-DE.ini -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/plugins/win-capture/data/locale/de-DE.ini Changed

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/plugins/win-capture/data/locale/el-GR.ini -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/plugins/win-capture/data/locale/el-GR.ini Changed

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/plugins/win-capture/data/locale/es-ES.ini -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/plugins/win-capture/data/locale/es-ES.ini Changed

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/plugins/win-capture/data/locale/eu-ES.ini -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/plugins/win-capture/data/locale/eu-ES.ini Changed

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/plugins/win-capture/data/locale/fi-FI.ini -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/plugins/win-capture/data/locale/fi-FI.ini Changed

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/plugins/win-capture/data/locale/fr-FR.ini -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/plugins/win-capture/data/locale/fr-FR.ini Changed

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/plugins/win-capture/data/locale/gl-ES.ini -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/plugins/win-capture/data/locale/gl-ES.ini Changed

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/plugins/win-capture/data/locale/hr-HR.ini -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/plugins/win-capture/data/locale/hr-HR.ini Changed

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/plugins/win-capture/data/locale/hu-HU.ini -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/plugins/win-capture/data/locale/hu-HU.ini Changed

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/plugins/win-capture/data/locale/ja-JP.ini -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/plugins/win-capture/data/locale/ja-JP.ini Changed

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/plugins/win-capture/data/locale/ko-KR.ini -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/plugins/win-capture/data/locale/ko-KR.ini Changed

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/plugins/win-capture/data/locale/nb-NO.ini -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/plugins/win-capture/data/locale/nb-NO.ini Changed

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/plugins/win-capture/data/locale/nl-NL.ini -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/plugins/win-capture/data/locale/nl-NL.ini Changed

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/plugins/win-capture/data/locale/ro-RO.ini -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/plugins/win-capture/data/locale/ro-RO.ini Changed

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/plugins/win-capture/data/locale/ru-RU.ini -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/plugins/win-capture/data/locale/ru-RU.ini Changed

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/plugins/win-capture/data/locale/sr-CS.ini -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/plugins/win-capture/data/locale/sr-CS.ini Changed

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/plugins/win-capture/data/locale/sr-SP.ini -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/plugins/win-capture/data/locale/sr-SP.ini Changed

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/plugins/win-capture/data/locale/sv-SE.ini -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/plugins/win-capture/data/locale/sv-SE.ini Changed

obs-studio-0.8.2+git20150211.6099c65.tar.xz/plugins/win-capture/data/locale/zh-CN.ini Added

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/plugins/win-capture/duplicator-monitor-capture.c -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/plugins/win-capture/duplicator-monitor-capture.c Changed

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/plugins/win-capture/funchook.h -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/plugins/win-capture/funchook.h Changed

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/plugins/win-capture/game-capture.c -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/plugins/win-capture/game-capture.c Changed

@@ -86,6 +86,7 @@
 	bool                          error_acquiring : 1;
 	bool                          dwm_capture : 1;
 	bool                          initial_config : 1;
+	bool                          convert_16bit : 1;
 
 	struct game_capture_config    config;
 
@@ -352,14 +353,14 @@
 		const char *name, DWORD process_id)
 {
 	char new_name[128];
-	sprintf(new_name, "%s%d", name, process_id);
+	sprintf(new_name, "%s%lu", name, process_id);
 	return CreateEventA(NULL, manual_reset, initial_state, new_name);
 }
 
 static inline HANDLE open_event_id(const char *name, DWORD process_id)
 {
 	char new_name[128];
-	sprintf(new_name, "%s%d", name, process_id);
+	sprintf(new_name, "%s%lu", name, process_id);
 	return OpenEventA(EVENT_ALL_ACCESS, false, new_name);
 }
 
@@ -542,7 +543,7 @@
 static inline bool init_pipe(struct game_capture *gc)
 {
 	char name[64];
-	sprintf(name, "%s%d", PIPE_NAME, gc->process_id);
+	sprintf(name, "%s%lu", PIPE_NAME, gc->process_id);
 
 	if (!ipc_pipe_server_start(&gc->pipe, name, pipe_log, gc)) {
 		warn("init_pipe: failed to start pipe");
@@ -738,7 +739,7 @@
 
 		if (!gc->thread_id || !gc->process_id) {
 			warn("error acquiring, failed to get window "
-					"thread/process ids: %d",
+					"thread/process ids: %lu",
 					GetLastError());
 			gc->error_acquiring = true;
 			return;
@@ -838,6 +839,94 @@
 	return true;
 }
 
+#define PIXEL_16BIT_SIZE 2
+#define PIXEL_32BIT_SIZE 4
+
+static inline uint32_t convert_5_to_8bit(uint16_t val)
+{
+	return (uint32_t)((double)(val & 0x1F) * (255.0/31.0));
+}
+
+static inline uint32_t convert_6_to_8bit(uint16_t val)
+{
+	return (uint32_t)((double)(val & 0x3F) * (255.0/63.0));
+}
+
+static void copy_b5g6r5_tex(struct game_capture *gc, int cur_texture,
+		uint8_t *data, uint32_t pitch)
+{
+	uint8_t *input = gc->texture_buffers[cur_texture];
+	uint32_t gc_cx = gc->cx;
+	uint32_t gc_cy = gc->cy;
+	uint32_t gc_pitch = gc->pitch;
+
+	for (uint32_t y = 0; y < gc_cy; y++) {
+		register uint8_t *in  = input + (gc_pitch * y);
+		register uint8_t *end = input + (gc_cx * PIXEL_16BIT_SIZE);
+		register uint8_t *out = data  + pitch;
+
+		while (in < end) {
+			register uint16_t in_pix = *(uint16_t*)in;
+			register uint32_t out_pix = 0xFF000000;
+
+			out_pix |= convert_5_to_8bit(in_pix);
+			in_pix >>= 5;
+			out_pix |= convert_6_to_8bit(in_pix) << 8;
+			in_pix >>= 6;
+			out_pix |= convert_5_to_8bit(in_pix) << 16;
+
+			*(uint32_t*)out = out_pix;
+
+			in  += PIXEL_16BIT_SIZE;
+			out += PIXEL_32BIT_SIZE;
+		}
+	}
+}
+
+static void copy_b5g5r5a1_tex(struct game_capture *gc, int cur_texture,
+		uint8_t *data, uint32_t pitch)
+{
+	uint8_t *input = gc->texture_buffers[cur_texture];
+	uint32_t gc_cx = gc->cx;
+	uint32_t gc_cy = gc->cy;
+	uint32_t gc_pitch = gc->pitch;
+
+	for (uint32_t y = 0; y < gc_cy; y++) {
+		register uint8_t *in  = input + (gc_pitch * y);
+		register uint8_t *end = input + (gc_cx * PIXEL_16BIT_SIZE);
+		register uint8_t *out = data  + pitch;
+
+		while (in < end) {
+			register uint16_t in_pix = *(uint16_t*)in;
+			register uint32_t out_pix = 0;
+
+			out_pix |= convert_5_to_8bit(in_pix);
+			in_pix >>= 5;
+			out_pix |= convert_5_to_8bit(in_pix) << 8;
+			in_pix >>= 5;
+			out_pix |= convert_5_to_8bit(in_pix) << 16;
+			in_pix >>= 5;
+			out_pix |= (in_pix * 255) << 24;
+
+			*(uint32_t*)out = out_pix;
+
+			in  += PIXEL_16BIT_SIZE;
+			out += PIXEL_32BIT_SIZE;
+		}
+	}
+}
+
+static inline void copy_16bit_tex(struct game_capture *gc, int cur_texture,
+		uint8_t *data, uint32_t pitch)
+{
+	if (gc->global_hook_info->format == DXGI_FORMAT_B5G5R5A1_UNORM) {
+		copy_b5g5r5a1_tex(gc, cur_texture, data, pitch);
+
+	} else if (gc->global_hook_info->format == DXGI_FORMAT_B5G6R5_UNORM) {
+		copy_b5g6r5_tex(gc, cur_texture, data, pitch);
+	}
+}
+
 static void copy_shmem_tex(struct game_capture *gc)
 {
 	int cur_texture = gc->shmem_data->last_tex;
@@ -863,7 +952,10 @@
 	}
 
 	if (gs_texture_map(gc->texture, &data, &pitch)) {
-		if (pitch == gc->pitch) {
+		if (gc->convert_16bit) {
+			copy_16bit_tex(gc, cur_texture, data, pitch);
+
+		} else if (pitch == gc->pitch) {
 			memcpy(data, gc->texture_buffers[cur_texture],
 					pitch * gc->cy);
 		} else {
@@ -884,18 +976,29 @@
 	ReleaseMutex(mutex);
 }
 
+static inline bool is_16bit_format(uint32_t format)
+{
+	return format == DXGI_FORMAT_B5G5R5A1_UNORM ||
+	       format == DXGI_FORMAT_B5G6R5_UNORM;
+}
+
 static inline bool init_shmem_capture(struct game_capture *gc)
 {
+	enum gs_color_format format;
+
 	gc->texture_buffers[0] =
 		(uint8_t*)gc->data + gc->shmem_data->tex1_offset;
 	gc->texture_buffers[1] =
 		(uint8_t*)gc->data + gc->shmem_data->tex2_offset;
 
+	gc->convert_16bit = is_16bit_format(gc->global_hook_info->format);
+	format = gc->convert_16bit ?
+		GS_BGRA : convert_format(gc->global_hook_info->format);
+
 	obs_enter_graphics();
 	gs_texture_destroy(gc->texture);
-	gc->texture = gs_texture_create(gc->cx, gc->cy,
-			convert_format(gc->global_hook_info->format),
-			1, NULL, GS_DYNAMIC);
+	gc->texture = gs_texture_create(gc->cx, gc->cy, format, 1, NULL,
+			GS_DYNAMIC);
 	obs_leave_graphics();
 
 	if (!gc->texture) {
@@ -943,6 +1046,14 @@
 	return true;
 }
 
+static inline bool capture_valid(struct game_capture *gc)
+{
+	if (!gc->dwm_capture && !IsWindow(gc->window))
+	       return false;
+	
+	return !object_signalled(gc->target_process);
+}
+
 static void game_capture_tick(void *data, float seconds)
 {
 	struct game_capture *gc = data;
@@ -963,7 +1074,7 @@
 		close_handle(&gc->injector_process);

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/plugins/win-capture/get-graphics-offsets/get-graphics-offsets.c -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/plugins/win-capture/get-graphics-offsets/get-graphics-offsets.c Changed

@@ -26,17 +26,17 @@
 	get_dxgi_offsets(&dxgi);
 
 	printf("[d3d8]\n");
-	printf("present=0x%"PRIxPTR"\n", d3d8.present);
-	printf("reset=0x%"PRIxPTR"\n", d3d8.reset);
+	printf("present=0x%"PRIx32"\n", d3d8.present);
+	printf("reset=0x%"PRIx32"\n", d3d8.reset);
 	printf("[d3d9]\n");
-	printf("present=0x%"PRIxPTR"\n", d3d9.present);
-	printf("present_ex=0x%"PRIxPTR"\n", d3d9.present_ex);
-	printf("present_swap=0x%"PRIxPTR"\n", d3d9.present_swap);
-	printf("reset=0x%"PRIxPTR"\n", d3d9.reset);
-	printf("reset_ex=0x%"PRIxPTR"\n", d3d9.reset_ex);
+	printf("present=0x%"PRIx32"\n", d3d9.present);
+	printf("present_ex=0x%"PRIx32"\n", d3d9.present_ex);
+	printf("present_swap=0x%"PRIx32"\n", d3d9.present_swap);
+	printf("reset=0x%"PRIx32"\n", d3d9.reset);
+	printf("reset_ex=0x%"PRIx32"\n", d3d9.reset_ex);
 	printf("[dxgi]\n");
-	printf("present=0x%"PRIxPTR"\n", dxgi.present);
-	printf("resize=0x%"PRIxPTR"\n", dxgi.resize);
+	printf("present=0x%"PRIx32"\n", dxgi.present);
+	printf("resize=0x%"PRIx32"\n", dxgi.resize);
 
 	(void)argc;
 	(void)argv;

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/plugins/win-capture/get-graphics-offsets/get-graphics-offsets.h -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/plugins/win-capture/get-graphics-offsets/get-graphics-offsets.h Changed

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/plugins/win-capture/graphics-hook-info.h -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/plugins/win-capture/graphics-hook-info.h Changed

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/plugins/win-capture/graphics-hook/CMakeLists.txt -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/plugins/win-capture/graphics-hook/CMakeLists.txt Changed

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/plugins/win-capture/graphics-hook/d3d10-capture.cpp -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/plugins/win-capture/graphics-hook/d3d10-capture.cpp Changed

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/plugins/win-capture/graphics-hook/d3d11-capture.cpp -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/plugins/win-capture/graphics-hook/d3d11-capture.cpp Changed

obs-studio-0.8.2+git20150211.6099c65.tar.xz/plugins/win-capture/graphics-hook/d3d8-capture.cpp Added

@@ -0,0 +1,302 @@
+#define _CRT_SECURE_NO_WARNINGS
+#include <dxgi.h>
+
+#include "../d3d8-api/d3d8.h"
+#include "graphics-hook.h"
+#include "../funchook.h"
+
+typedef HRESULT(STDMETHODCALLTYPE *reset_t)(IDirect3DDevice8*,
+		D3DPRESENT_PARAMETERS*);
+typedef HRESULT(STDMETHODCALLTYPE *present_t)(IDirect3DDevice8*,
+		CONST RECT*, CONST RECT*, HWND, CONST RGNDATA*);
+
+static struct func_hook present;
+static struct func_hook reset;
+
+struct d3d8_data {
+	HMODULE                        d3d8;
+	uint32_t                       cx;
+	uint32_t                       cy;
+	D3DFORMAT                      d3d8_format;
+	DXGI_FORMAT                    dxgi_format;
+
+	struct shmem_data              *shmem_info;
+	HWND                           window;
+	uint32_t                       pitch;
+	IDirect3DSurface8              *copy_surfaces[NUM_BUFFERS];
+	bool                           surface_locked[NUM_BUFFERS];
+	int                            cur_surface;
+	int                            copy_wait;
+};
+
+static d3d8_data data = {};
+
+static DXGI_FORMAT d3d8_to_dxgi_format(D3DFORMAT format)
+{
+	switch ((unsigned long)format) {
+	case D3DFMT_X1R5G5B5:
+	case D3DFMT_A1R5G5B5: return DXGI_FORMAT_B5G5R5A1_UNORM;
+	case D3DFMT_R5G6B5:   return DXGI_FORMAT_B5G6R5_UNORM;
+	case D3DFMT_A8R8G8B8: return DXGI_FORMAT_B8G8R8A8_UNORM;
+	case D3DFMT_X8R8G8B8: return DXGI_FORMAT_B8G8R8X8_UNORM;
+	}
+
+	return DXGI_FORMAT_UNKNOWN;
+}
+
+static IDirect3DSurface8 *d3d8_get_backbuffer(IDirect3DDevice8 *device)
+{
+	IDirect3DSurface8 *backbuffer;
+	HRESULT hr;
+
+	hr = device->GetRenderTarget(&backbuffer);
+	if (FAILED(hr)) {
+		hlog_hr("d3d8_get_backbuffer: Failed to get backbuffer", hr);
+		backbuffer = nullptr;
+	}
+
+	return backbuffer;
+}
+
+static bool d3d8_get_window_handle(IDirect3DDevice8 *device)
+{
+	D3DDEVICE_CREATION_PARAMETERS parameters;
+	HRESULT hr;
+	hr = device->GetCreationParameters(&parameters);
+	if (FAILED(hr)) {
+		hlog_hr("d3d8_get_window_handle: Failed to get "
+				"device creation parameters", hr);
+		return false;
+	}
+
+	data.window = parameters.hFocusWindow;
+
+	return true;
+}
+
+static bool d3d8_init_format_backbuffer(IDirect3DDevice8 *device)
+{
+	IDirect3DSurface8 *backbuffer;
+	D3DSURFACE_DESC desc;
+	HRESULT hr;
+
+	if (!d3d8_get_window_handle(device))
+		return false;
+
+	backbuffer = d3d8_get_backbuffer(device);
+	if (!backbuffer)
+		return false;
+
+	hr = backbuffer->GetDesc(&desc);
+	backbuffer->Release();
+	if (FAILED(hr)) {
+		hlog_hr("d3d8_init_format_backbuffer: Failed to get "
+				"backbuffer descriptor", hr);
+		return false;
+	}
+
+	data.d3d8_format = desc.Format;
+	data.dxgi_format = d3d8_to_dxgi_format(desc.Format);
+	data.cx = desc.Width;
+	data.cy = desc.Height;
+
+	return true;
+}
+
+static bool d3d8_shmem_init_buffer(IDirect3DDevice8 *device, int idx)
+{
+	HRESULT hr;
+
+	hr = device->CreateImageSurface(data.cx, data.cy,
+			data.d3d8_format, &data.copy_surfaces[idx]);
+	if (FAILED(hr)) {
+		hlog_hr("d3d8_shmem_init_buffer: Failed to create surface", hr);
+		return false;
+	}
+
+	if (idx == 0) {
+		D3DLOCKED_RECT rect;
+		hr = data.copy_surfaces[0]->LockRect(&rect, nullptr,
+				D3DLOCK_READONLY);
+		if (FAILED(hr)) {
+			hlog_hr("d3d8_shmem_init_buffer: Failed to lock buffer", hr);
+			return false;
+		}
+
+		data.pitch = rect.Pitch;
+		data.copy_surfaces[0]->UnlockRect();
+	}
+
+	return true;
+}
+
+static bool d3d8_shmem_init(IDirect3DDevice8 *device)
+{
+	for (int i = 0; i < NUM_BUFFERS; i++) {
+		if (!d3d8_shmem_init_buffer(device, i)) {
+			return false;
+		}
+	}
+	if (!capture_init_shmem(&data.shmem_info, data.window, data.cx, data.cy,
+				data.cx, data.cy, data.pitch, data.dxgi_format,
+				false)) {
+		return false;
+	}
+
+	hlog("d3d8 memory capture successfull");
+	return true;
+}
+
+static void d3d8_free()
+{
+	capture_free();
+
+	for (size_t i = 0; i < NUM_BUFFERS; i++) {
+		if (data.copy_surfaces[i]) {
+			if (data.surface_locked[i])
+				data.copy_surfaces[i]->UnlockRect();
+			data.copy_surfaces[i]->Release();
+		}
+	}
+
+	memset(&data, 0, sizeof(data));
+
+	hlog("----------------- d3d8 capture freed -----------------");
+}
+
+static void d3d8_init(IDirect3DDevice8 *device)
+{
+	data.d3d8 = get_system_module("d3d8.dll");
+
+	if (!d3d8_init_format_backbuffer(device))
+		return;
+
+	if (!d3d8_shmem_init(device))
+		d3d8_free();
+}
+
+static void d3d8_shmem_capture_copy(int idx)
+{
+	IDirect3DSurface8 *target = data.copy_surfaces[idx];
+	D3DLOCKED_RECT rect;
+	HRESULT hr;
+
+	if (data.surface_locked[idx])
+		return;
+
+	hr = target->LockRect(&rect, nullptr, D3DLOCK_READONLY);
+	if (SUCCEEDED(hr)) {
+		shmem_copy_data(idx, rect.pBits);
+	}
+}
+
+static void d3d8_shmem_capture(IDirect3DDevice8 *device,
+		IDirect3DSurface8 *backbuffer)
+{
+	int cur_surface;
+	int next_surface;
+	HRESULT hr;
+

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/plugins/win-capture/graphics-hook/d3d9-capture.cpp -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/plugins/win-capture/graphics-hook/d3d9-capture.cpp Changed

@@ -98,7 +98,7 @@
 
 static DXGI_FORMAT d3d9_to_dxgi_format(D3DFORMAT format)
 {
-	switch (format) {
+	switch ((unsigned long)format) {
 	case D3DFMT_A2B10G10R10: return DXGI_FORMAT_R10G10B10A2_UNORM;
 	case D3DFMT_A8R8G8B8:    return DXGI_FORMAT_B8G8R8A8_UNORM;
 	case D3DFMT_X8R8G8B8:    return DXGI_FORMAT_B8G8R8X8_UNORM;
@@ -285,7 +285,7 @@
 	}
 	if (!capture_init_shtex(&data.shtex_info, window, cx, cy,
 				data.cx, data.cy, data.dxgi_format, false,
-				(uint32_t)data.handle)) {
+				(uintptr_t)data.handle)) {
 		return false;
 	}
 
@@ -425,7 +425,7 @@
 	return true;
 }
 
-static bool d3d9_init_format_swapchain(uint32_t cx, uint32_t cy, HWND window)
+static bool d3d9_init_format_swapchain(uint32_t &cx, uint32_t &cy, HWND &window)
 {
 	D3DPRESENT_PARAMETERS pp;
 
@@ -455,9 +455,9 @@
 {
 	IDirect3DDevice9Ex *d3d9ex = nullptr;
 	bool success;
-	uint32_t cx;
-	uint32_t cy;
-	HWND window;
+	uint32_t cx = 0;
+	uint32_t cy = 0;
+	HWND window = nullptr;
 	HRESULT hr;
 
 	data.d3d9 = get_system_module("d3d9.dll");
@@ -773,15 +773,15 @@
 	reset_ex_addr = get_offset_addr(d3d9_module,
 			global_hook_info->offsets.d3d9.reset_ex);
 
-	hook_init(&present, present_addr, hook_present,
+	hook_init(&present, present_addr, (void*)hook_present,
 			"IDirect3DDevice9::Present");
-	hook_init(&present_ex, present_ex_addr, hook_present_ex,
+	hook_init(&present_ex, present_ex_addr, (void*)hook_present_ex,
 			"IDirect3DDevice9Ex::PresentEx");
-	hook_init(&present_swap, present_swap_addr, hook_present_swap,
+	hook_init(&present_swap, present_swap_addr, (void*)hook_present_swap,
 			"IDirect3DSwapChain9::Present");
-	hook_init(&reset, reset_addr, hook_reset,
+	hook_init(&reset, reset_addr, (void*)hook_reset,
 			"IDirect3DDevice9::Reset");
-	hook_init(&reset_ex, reset_ex_addr, hook_reset_ex,
+	hook_init(&reset_ex, reset_ex_addr, (void*)hook_reset_ex,
 			"IDirect3DDevice9Ex::ResetEx");
 
 	rehook(&reset_ex);

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/plugins/win-capture/graphics-hook/d3d9-patches.hpp -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/plugins/win-capture/graphics-hook/d3d9-patches.hpp Changed

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/plugins/win-capture/graphics-hook/dxgi-capture.cpp -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/plugins/win-capture/graphics-hook/dxgi-capture.cpp Changed

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/plugins/win-capture/graphics-hook/dxgi-helpers.hpp -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/plugins/win-capture/graphics-hook/dxgi-helpers.hpp Changed

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/plugins/win-capture/graphics-hook/gl-capture.c -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/plugins/win-capture/graphics-hook/gl-capture.c Changed

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/plugins/win-capture/graphics-hook/gl-decs.h -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/plugins/win-capture/graphics-hook/gl-decs.h Changed

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/plugins/win-capture/graphics-hook/graphics-hook.c -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/plugins/win-capture/graphics-hook/graphics-hook.c Changed

@@ -2,7 +2,6 @@
 #include <windows.h>
 #include <shlobj.h>
 #include <psapi.h>
-#include <ipc-util/pipe.h>
 #include "graphics-hook.h"
 #include "../obfuscate.h"
 #include "../funchook.h"
@@ -29,19 +28,19 @@
 	volatile bool          locked_textures[NUM_BUFFERS];
 };
 
-static ipc_pipe_client_t       pipe                            = {0};
-static HANDLE                  signal_restart                  = NULL;
-static HANDLE                  signal_stop                     = NULL;
-static HANDLE                  signal_ready                    = NULL;
-static HANDLE                  signal_exit                     = NULL;
-static HANDLE                  tex_mutexes[2]                  = {NULL, NULL};
+ipc_pipe_client_t              pipe                            = {0};
+HANDLE                         signal_restart                  = NULL;
+HANDLE                         signal_stop                     = NULL;
+HANDLE                         signal_ready                    = NULL;
+HANDLE                         signal_exit                     = NULL;
+HANDLE                         tex_mutexes[2]                  = {NULL, NULL};
 static HANDLE                  filemap_hook_info               = NULL;
 
 static volatile bool           stop_loop                       = false;
 static HANDLE                  capture_thread                  = NULL;
-static char                    system_path[MAX_PATH]           = {0};
-static char                    process_name[MAX_PATH]          = {0};
-static char                    keepalive_name[64]              = {0};
+char                           system_path[MAX_PATH]           = {0};
+char                           process_name[MAX_PATH]          = {0};
+char                           keepalive_name[64]              = {0};
 
 static unsigned int            shmem_id_counter                = 0;
 static void                    *shmem_info                     = NULL;
@@ -60,10 +59,10 @@
 	}
 }
 
-static inline bool init_pipe(void)
+bool init_pipe(void)
 {
 	char new_name[64];
-	sprintf(new_name, "%s%d", PIPE_NAME, GetCurrentProcessId());
+	sprintf(new_name, "%s%lu", PIPE_NAME, GetCurrentProcessId());
 
 	if (!ipc_pipe_client_open(&pipe, new_name)) {
 		DbgOut("Failed to open pipe\n");
@@ -86,7 +85,7 @@
 	char new_name[64];
 	HANDLE handle;
 
-	sprintf(new_name, "%s%d", name, pid);
+	sprintf(new_name, "%s%lu", name, pid);
 
 	handle = OpenMutexA(MUTEX_ALL_ACCESS, false, new_name);
 	if (!handle)
@@ -186,7 +185,7 @@
 {
 	wait_for_dll_main_finish(thread_handle);
 
-	sprintf(keepalive_name, "%s%d", EVENT_HOOK_KEEPALIVE,
+	sprintf(keepalive_name, "%s%lu", EVENT_HOOK_KEEPALIVE,
 			GetCurrentProcessId());
 
 	if (!init_pipe()) {
@@ -274,7 +273,7 @@
 
 static inline bool attempt_hook(void)
 {
-	static bool ddraw_hooked = false;
+	//static bool ddraw_hooked = false;
 	static bool d3d8_hooked  = false;
 	static bool d3d9_hooked  = false;
 	static bool dxgi_hooked  = false;
@@ -311,7 +310,7 @@
 		rehook_gl();*/
 	}
 
-	/*if (!d3d8_hooked) {
+	if (!d3d8_hooked) {
 		if (!d3d8_hookable()) {
 			d3d8_hooked = true;
 		} else {
@@ -322,7 +321,7 @@
 		}
 	}
 
-	if (!ddraw_hooked) {
+	/*if (!ddraw_hooked) {
 		if (!ddraw_hookable()) {
 			ddraw_hooked = true;
 		} else {
@@ -401,87 +400,6 @@
 	}
 }
 
-inline const char *get_process_name(void)
-{
-	return process_name;
-}
-
-inline HMODULE get_system_module(const char *module)
-{
-	char base_path[MAX_PATH];
-
-	strcpy(base_path, system_path);
-	strcat(base_path, "\\");
-	strcat(base_path, module);
-	return GetModuleHandleA(module);
-}
-
-inline HMODULE load_system_library(const char *name)
-{
-	char base_path[MAX_PATH];
-	HMODULE module;
-
-	strcpy(base_path, system_path);
-	strcat(base_path, "\\");
-	strcat(base_path, name);
-
-	module = GetModuleHandleA(base_path);
-	if (module)
-		return module;
-
-	return LoadLibraryA(base_path);
-}
-
-static inline bool capture_alive(void)
-{
-	HANDLE event = OpenEventA(EVENT_ALL_ACCESS, false, keepalive_name);
-	if (event) {
-		CloseHandle(event);
-		return true;
-	}
-
-	return false;
-}
-
-inline bool capture_active(void)
-{
-	return active;
-}
-
-static inline bool capture_stopped(void)
-{
-	return WaitForSingleObject(signal_stop, 0) == WAIT_OBJECT_0;
-}
-
-static inline bool capture_restarted(void)
-{
-	return WaitForSingleObject(signal_restart, 0) == WAIT_OBJECT_0;
-}
-
-inline bool capture_should_stop(void)
-{
-	bool stop_requested = false;
-
-	if (capture_active())
-		stop_requested = capture_stopped() || !capture_alive();
-
-	return stop_requested;
-}
-
-inline bool capture_should_init(void)
-{
-	if (!capture_active() && capture_restarted()) {
-		if (capture_alive()) {
-			if (!ipc_pipe_client_valid(&pipe)) {
-				init_pipe();
-			}
-			return true;
-		}
-	}
-
-	return false;
-}
-
 static inline uint64_t get_clockfreq(void)
 {
 	static bool have_clockfreq = false;
@@ -508,7 +426,7 @@
 	return (uint64_t)time_val;
 }
 
-inline int try_lock_shmem_tex(int id)
+static inline int try_lock_shmem_tex(int id)
 {
 	int next = id == 0 ? 1 : 0;
 
@@ -521,40 +439,13 @@
 	return -1;
 }
 
-inline void unlock_shmem_tex(int id)
+static inline void unlock_shmem_tex(int id)
 {
 	if (id != -1) {

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/plugins/win-capture/graphics-hook/graphics-hook.h -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/plugins/win-capture/graphics-hook/graphics-hook.h Changed

@@ -1,14 +1,17 @@
 #pragma once
 
+#ifdef _MSC_VER
 /* conversion from data/function pointer */
 #pragma warning(disable: 4152)
+#endif
 
 #include "../graphics-hook-info.h"
+#include <ipc-util/pipe.h>
 
 #ifdef __cplusplus
 extern "C" {
 #else
-#ifndef inline
+#if defined(_MSC_VER) && !defined(inline)
 #define inline __inline
 #endif
 #endif
@@ -17,19 +20,19 @@
 
 extern void hlog(const char *format, ...);
 extern void hlog_hr(const char *text, HRESULT hr);
-extern inline const char *get_process_name(void);
-extern inline HMODULE get_system_module(const char *module);
-extern inline HMODULE load_system_library(const char *module);
+static inline const char *get_process_name(void);
+static inline HMODULE get_system_module(const char *module);
+static inline HMODULE load_system_library(const char *module);
 extern uint64_t os_gettime_ns(void);
 
-extern inline bool capture_active(void);
-extern inline bool capture_ready(void);
-extern inline bool capture_should_stop(void);
-extern inline bool capture_should_init(void);
+static inline bool capture_active(void);
+static inline bool capture_ready(void);
+static inline bool capture_should_stop(void);
+static inline bool capture_should_init(void);
 
-extern inline void shmem_copy_data(size_t idx, void *volatile data);
-extern inline bool shmem_texture_data_lock(int idx);
-extern inline void shmem_texture_data_unlock(int idx);
+extern void shmem_copy_data(size_t idx, void *volatile data);
+extern bool shmem_texture_data_lock(int idx);
+extern void shmem_texture_data_unlock(int idx);
 
 extern bool hook_ddraw(void);
 extern bool hook_d3d8(void);
@@ -49,7 +52,7 @@
 
 extern bool capture_init_shtex(struct shtex_data **data, HWND window,
 		uint32_t base_cx, uint32_t base_cy, uint32_t cx, uint32_t cy,
-		uint32_t format, bool flip, uint32_t handle);
+		uint32_t format, bool flip, uintptr_t handle);
 extern bool capture_init_shmem(struct shmem_data **data, HWND window,
 		uint32_t base_cx, uint32_t base_cy, uint32_t cx, uint32_t cy,
 		uint32_t pitch, uint32_t format, bool flip);
@@ -77,6 +80,129 @@
 	return (void*)((uintptr_t)module + (uintptr_t)offset);
 }
 
+/* ------------------------------------------------------------------------- */
+
+extern ipc_pipe_client_t pipe;
+extern HANDLE signal_restart;
+extern HANDLE signal_stop;
+extern HANDLE signal_ready;
+extern HANDLE signal_exit;
+extern HANDLE tex_mutexes[2];
+extern char system_path[MAX_PATH];
+extern char process_name[MAX_PATH];
+extern char keepalive_name[64];
+extern volatile bool active;
+
+static inline const char *get_process_name(void)
+{
+	return process_name;
+}
+
+static inline HMODULE get_system_module(const char *module)
+{
+	char base_path[MAX_PATH];
+
+	strcpy(base_path, system_path);
+	strcat(base_path, "\\");
+	strcat(base_path, module);
+	return GetModuleHandleA(module);
+}
+
+static inline HMODULE load_system_library(const char *name)
+{
+	char base_path[MAX_PATH];
+	HMODULE module;
+
+	strcpy(base_path, system_path);
+	strcat(base_path, "\\");
+	strcat(base_path, name);
+
+	module = GetModuleHandleA(base_path);
+	if (module)
+		return module;
+
+	return LoadLibraryA(base_path);
+}
+
+static inline bool capture_alive(void)
+{
+	HANDLE event = OpenEventA(EVENT_ALL_ACCESS, false, keepalive_name);
+	if (event) {
+		CloseHandle(event);
+		return true;
+	}
+
+	return false;
+}
+
+static inline bool capture_active(void)
+{
+	return active;
+}
+
+static inline bool frame_ready(uint64_t interval)
+{
+	static uint64_t last_time = 0;
+	uint64_t        elapsed;
+	uint64_t        t;
+
+	if (!interval) {
+		return true;
+	}
+
+	t = os_gettime_ns();
+	elapsed = t - last_time;
+
+	if (elapsed < interval) {
+		return false;
+	}
+
+	last_time = (elapsed > interval * 2) ? t : last_time + interval;
+	return true;
+}
+
+static inline bool capture_ready(void)
+{
+	return capture_active() &&
+		frame_ready(global_hook_info->frame_interval);
+}
+
+static inline bool capture_stopped(void)
+{
+	return WaitForSingleObject(signal_stop, 0) == WAIT_OBJECT_0;
+}
+
+static inline bool capture_restarted(void)
+{
+	return WaitForSingleObject(signal_restart, 0) == WAIT_OBJECT_0;
+}
+
+static inline bool capture_should_stop(void)
+{
+	bool stop_requested = false;
+
+	if (capture_active())
+		stop_requested = capture_stopped() || !capture_alive();
+
+	return stop_requested;
+}
+
+extern bool init_pipe(void);
+
+static inline bool capture_should_init(void)
+{
+	if (!capture_active() && capture_restarted()) {
+		if (capture_alive()) {
+			if (!ipc_pipe_client_valid(&pipe)) {
+				init_pipe();
+			}
+			return true;
+		}
+	}
+
+	return false;
+}
+
 #ifdef __cplusplus
 }
 #endif

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/plugins/win-capture/hook-helpers.h -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/plugins/win-capture/hook-helpers.h Changed

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/plugins/win-capture/inject-helper/inject-helper.c -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/plugins/win-capture/inject-helper/inject-helper.c Changed

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/plugins/win-capture/load-graphics-offsets.c -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/plugins/win-capture/load-graphics-offsets.c Changed

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/plugins/win-capture/monitor-capture.c -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/plugins/win-capture/monitor-capture.c Changed

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/plugins/win-capture/obfuscate.c -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/plugins/win-capture/obfuscate.c Changed

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/plugins/win-capture/window-helpers.c -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/plugins/win-capture/window-helpers.c Changed

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/plugins/win-dshow/CMakeLists.txt -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/plugins/win-dshow/CMakeLists.txt Changed

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/plugins/win-dshow/data/locale/ar-SA.ini -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/plugins/win-dshow/data/locale/ar-SA.ini Changed

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/plugins/win-dshow/data/locale/bg-BG.ini -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/plugins/win-dshow/data/locale/bg-BG.ini Changed

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/plugins/win-dshow/data/locale/da-DK.ini -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/plugins/win-dshow/data/locale/da-DK.ini Changed

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/plugins/win-dshow/data/locale/de-DE.ini -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/plugins/win-dshow/data/locale/de-DE.ini Changed

@@ -1,11 +1,16 @@
-VideoCaptureDevice="Videogerät"
+VideoCaptureDevice="Videoaufnahmegerät"
 Device="Gerät"
+ColorSpace="YUV-Farbraum"
+ColorSpace.Default="Standard"
+ColorRange="YUV Farbpalette"
+ColorRange.Partial="Teilweise"
+ColorRange.Full="Voll"
 ConfigureAudio="Audio konfigurieren"
 ConfigureVideo="Video konfigurieren"
 ConfigureCrossbar="Crossbar konfigurieren"
 ResFPSType="Auflösung/FPS Typ"
 ResFPSType.Custom="Benutzerdefiniert"
-ResFPSType.DevPreferred="Bevorzugte Einstellungen des Geräts benutzen"
+ResFPSType.DevPreferred="Gerätestandard"
 FPS.Matching="Ausgang FPS benutzen"
 FPS.Highest="Höchstmögliche FPS"
 Resolution="Auflösung"
@@ -14,4 +19,14 @@
 VideoFormat.Unknown="Unbekannt (%1)"
 UseCustomAudioDevice="Verwende eigenes Audiogerät"
 AudioDevice="Audiogerät"
+Buffering="Pufferung"
+Buffering.AutoDetect="Automatisch erkennen"
+Buffering.Enable="Aktivieren"
+Buffering.Disable="Deaktivieren"
+Activate="Aktivieren"
+Deactivate="Deaktivieren"
+
+Bitrate="Bitrate"
+Encoder.C985="AVerMedia C985 Encoder"
+Encoder.C353="AVerMedia C353 Encoder"

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/plugins/win-dshow/data/locale/el-GR.ini -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/plugins/win-dshow/data/locale/el-GR.ini Changed

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/plugins/win-dshow/data/locale/en-US.ini -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/plugins/win-dshow/data/locale/en-US.ini Changed

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/plugins/win-dshow/data/locale/es-ES.ini -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/plugins/win-dshow/data/locale/es-ES.ini Changed

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/plugins/win-dshow/data/locale/eu-ES.ini -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/plugins/win-dshow/data/locale/eu-ES.ini Changed

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/plugins/win-dshow/data/locale/fi-FI.ini -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/plugins/win-dshow/data/locale/fi-FI.ini Changed

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/plugins/win-dshow/data/locale/fr-FR.ini -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/plugins/win-dshow/data/locale/fr-FR.ini Changed

@@ -1,11 +1,16 @@
 VideoCaptureDevice="Périphérique de Capture Vidéo"
 Device="Appareil"
+ColorSpace="Espace de couleur YUV"
+ColorSpace.Default="Par défaut"
+ColorRange="Gamme de couleurs YUV"
+ColorRange.Partial="Partielle"
+ColorRange.Full="Complète"
 ConfigureAudio="Configurer l'audio"
 ConfigureVideo="Configurer la Vidéo"
 ConfigureCrossbar="Configurer la Crossbar"
 ResFPSType="Type de Résolution/FPS"
 ResFPSType.Custom="Personnalisé"
-ResFPSType.DevPreferred="Appareil préféré"
+ResFPSType.DevPreferred="Paramètres par défaut du périphérique"
 FPS.Matching="Associer les FPS Sortants"
 FPS.Highest="FPS Maximum"
 Resolution="Résolution"
@@ -14,4 +19,12 @@
 VideoFormat.Unknown="Inconnu (%1)"
 UseCustomAudioDevice="Utiliser un périphérique audio personnalisé"
 AudioDevice="Périphérique audio"
+Buffering="Mise en mémoire tampon"
+Buffering.AutoDetect="Détecter automatiquement"
+Buffering.Enable="Activer"
+Buffering.Disable="Désactiver"
+Activate="Activer"
+Deactivate="Désactiver"
+
+Bitrate="Débit"

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/plugins/win-dshow/data/locale/gl-ES.ini -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/plugins/win-dshow/data/locale/gl-ES.ini Changed

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/plugins/win-dshow/data/locale/hr-HR.ini -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/plugins/win-dshow/data/locale/hr-HR.ini Changed

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/plugins/win-dshow/data/locale/hu-HU.ini -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/plugins/win-dshow/data/locale/hu-HU.ini Changed

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/plugins/win-dshow/data/locale/it-IT.ini -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/plugins/win-dshow/data/locale/it-IT.ini Changed

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/plugins/win-dshow/data/locale/ja-JP.ini -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/plugins/win-dshow/data/locale/ja-JP.ini Changed

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/plugins/win-dshow/data/locale/ko-KR.ini -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/plugins/win-dshow/data/locale/ko-KR.ini Changed

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/plugins/win-dshow/data/locale/nb-NO.ini -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/plugins/win-dshow/data/locale/nb-NO.ini Changed

@@ -1,11 +1,16 @@
 VideoCaptureDevice="Videoopptaksenhet"
 Device="Enhet"
+ColorSpace="YUV fargerom"
+ColorSpace.Default="Standard"
+ColorRange="YUV fargespekter"
+ColorRange.Partial="Delvis"
+ColorRange.Full="Full"
 ConfigureAudio="Konfigurer lyd"
 ConfigureVideo="Konfigurer video"
 ConfigureCrossbar="Konfigurer bildemikser"
 ResFPSType="Oppløsning/bilder per sekund type"
 ResFPSType.Custom="Egendefinert"
-ResFPSType.DevPreferred="Foretrukket enhet"
+ResFPSType.DevPreferred="Enhetsstandard"
 FPS.Matching="Match utgangs bilder per sekund"
 FPS.Highest="Høyeste antall bilder per sekund"
 Resolution="Oppløsning"
@@ -14,4 +19,14 @@
 VideoFormat.Unknown="Ukjent (%1)"
 UseCustomAudioDevice="Bruk egendefinert lydenhet"
 AudioDevice="Lydenhet"
+Buffering="Bufring"
+Buffering.AutoDetect="Automatisk søk"
+Buffering.Enable="Aktiver"
+Buffering.Disable="Deaktiver"
+Activate="Aktiver"
+Deactivate="Deaktiver"
+
+Bitrate="Bitrate"
+Encoder.C985="AVerMedia C985 koder"
+Encoder.C353="AVerMedia C353 koder"

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/plugins/win-dshow/data/locale/nl-NL.ini -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/plugins/win-dshow/data/locale/nl-NL.ini Changed

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/plugins/win-dshow/data/locale/pl-PL.ini -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/plugins/win-dshow/data/locale/pl-PL.ini Changed

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/plugins/win-dshow/data/locale/pt-BR.ini -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/plugins/win-dshow/data/locale/pt-BR.ini Changed

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/plugins/win-dshow/data/locale/pt-PT.ini -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/plugins/win-dshow/data/locale/pt-PT.ini Changed

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/plugins/win-dshow/data/locale/ro-RO.ini -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/plugins/win-dshow/data/locale/ro-RO.ini Changed

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/plugins/win-dshow/data/locale/ru-RU.ini -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/plugins/win-dshow/data/locale/ru-RU.ini Changed

@@ -1,11 +1,16 @@
 VideoCaptureDevice="Устройство захвата видео"
 Device="Устройство"
+ColorSpace="Цветовое пространство YUV"
+ColorSpace.Default="По умолчанию"
+ColorRange="Цветовой диапазон YUV"
+ColorRange.Partial="Частичный"
+ColorRange.Full="Полный"
 ConfigureAudio="Настроить звук"
 ConfigureVideo="Настройка видео"
 ConfigureCrossbar="Настройка кроссбара"
 ResFPSType="Разрешение/Частота кадров"
 ResFPSType.Custom="Пользовательское"
-ResFPSType.DevPreferred="Рекомендуемое устройством"
+ResFPSType.DevPreferred="Стандартные значения устройства"
 FPS.Matching="Согласовать с выходной частотой кадров"
 FPS.Highest="Наибольшая частота кадров"
 Resolution="Разрешение"
@@ -14,4 +19,12 @@
 VideoFormat.Unknown="Неизвестный (%1)"
 UseCustomAudioDevice="Использовать пользовательское аудиоустройство"
 AudioDevice="Аудиоустройство"
+Buffering="Буферизация"
+Buffering.AutoDetect="Авто-обнаружение"
+Buffering.Enable="Включить"
+Buffering.Disable="Отключить"
+Activate="Активировать"
+Deactivate="Деактивировать"
+
+Bitrate="Битрейт"

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/plugins/win-dshow/data/locale/sk-SK.ini -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/plugins/win-dshow/data/locale/sk-SK.ini Changed

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/plugins/win-dshow/data/locale/sl-SI.ini -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/plugins/win-dshow/data/locale/sl-SI.ini Changed

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/plugins/win-dshow/data/locale/sr-CS.ini -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/plugins/win-dshow/data/locale/sr-CS.ini Changed

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/plugins/win-dshow/data/locale/sr-SP.ini -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/plugins/win-dshow/data/locale/sr-SP.ini Changed

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/plugins/win-dshow/data/locale/sv-SE.ini -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/plugins/win-dshow/data/locale/sv-SE.ini Changed

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/plugins/win-dshow/data/locale/th-TH.ini -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/plugins/win-dshow/data/locale/th-TH.ini Changed

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/plugins/win-dshow/data/locale/tr-TR.ini -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/plugins/win-dshow/data/locale/tr-TR.ini Changed

obs-studio-0.8.2+git20150211.6099c65.tar.xz/plugins/win-dshow/data/locale/zh-CN.ini Added

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/plugins/win-dshow/data/locale/zh-TW.ini -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/plugins/win-dshow/data/locale/zh-TW.ini Changed

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/plugins/win-dshow/ffmpeg-decode.c -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/plugins/win-dshow/ffmpeg-decode.c Changed

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/plugins/win-dshow/ffmpeg-decode.h -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/plugins/win-dshow/ffmpeg-decode.h Changed

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/plugins/win-dshow/libdshowcapture/dshowcapture.hpp -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/plugins/win-dshow/libdshowcapture/dshowcapture.hpp Changed

obs-studio-0.8.2+git20150211.6099c65.tar.xz/plugins/win-dshow/libdshowcapture/source/ComPtr.hpp Added

@@ -0,0 +1,136 @@
+/*
+ * Copyright (c) 2013 Hugh Bailey <obs.jim@gmail.com>
+ *
+ * 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
+
+/* Oh no I have my own com pointer class, the world is ending, how dare you
+ * write your own! */
+
+template<class T> class ComPtr {
+
+protected:
+	T *ptr;
+
+	inline void Kill()
+	{
+		if (ptr)
+			ptr->Release();
+	}
+
+	inline void Replace(T *p)
+	{
+		if (ptr != p) {
+			if (p)   p->AddRef();
+			if (ptr) ptr->Release();
+			ptr = p;
+		}
+	}
+
+public:
+	inline ComPtr() : ptr(NULL)                    {}
+	inline ComPtr(T *p) : ptr(p)                   {if (ptr) ptr->AddRef();}
+	inline ComPtr(const ComPtr<T> &c) : ptr(c.ptr) {if (ptr) ptr->AddRef();}
+	inline ComPtr(ComPtr<T> &&c) : ptr(c.ptr)      {c.ptr = NULL;}
+	inline ~ComPtr()                               {Kill();}
+
+	inline void Clear()
+	{
+		if (ptr) {
+			ptr->Release();
+			ptr = NULL;
+		}
+	}
+
+	inline ComPtr<T> &operator=(T *p)
+	{
+		Replace(p);
+		return *this;
+	}
+
+	inline ComPtr<T> &operator=(const ComPtr<T> &c)
+	{
+		Replace(c.ptr);
+		return *this;
+	}
+
+	inline ComPtr<T> &operator=(ComPtr<T> &&c)
+	{
+		if (this != &c) {
+			Kill();
+			ptr = c.ptr;
+			c.ptr = NULL;
+		}
+
+		return *this;
+	}
+
+	inline T *Detach()
+	{
+		T *out = ptr;
+		ptr = nullptr;
+		return out;
+	}
+
+	inline void CopyTo(T **out)
+	{
+		if (out) {
+			if (ptr) ptr->AddRef();
+			*out = ptr;
+		}
+	}
+
+	inline ULONG Release()
+	{
+		ULONG ref;
+
+		if (!ptr) return 0;
+		ref = ptr->Release();
+		ptr = nullptr;
+		return ref;
+	}
+
+	inline T **Assign()                {Clear(); return &ptr;}
+	inline void Set(T *p)              {Kill(); ptr = p;}
+
+	inline T *Get() const              {return ptr;}
+
+	inline T **operator&()             {return Assign();}
+
+	inline    operator T*() const      {return ptr;}
+	inline T *operator->() const       {return ptr;}
+
+	inline bool operator==(T *p) const {return ptr == p;}
+	inline bool operator!=(T *p) const {return ptr != p;}
+
+	inline bool operator!() const      {return !ptr;}
+};
+
+template<class T> class ComQIPtr : public ComPtr<T> {
+
+public:
+	inline ComQIPtr(IUnknown *unk)
+	{
+		this->ptr = nullptr;
+		unk->QueryInterface(__uuidof(T), (void**)&this->ptr);
+	}
+
+	inline ComPtr<T> &operator=(IUnknown *unk)
+	{
+		ComPtr<T>::Clear();
+		unk->QueryInterface(__uuidof(T), (void**)&this->ptr);
+		return *this;
+	}
+};

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/plugins/win-dshow/libdshowcapture/source/IVideoCaptureFilter.h -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/plugins/win-dshow/libdshowcapture/source/IVideoCaptureFilter.h Changed

@@ -86,7 +86,7 @@
 =============================================================================*/
 
 //! Video Capture device type
-typedef enum VIDEO_CAPTURE_FILTER_DEVICE_TYPE
+enum VIDEO_CAPTURE_FILTER_DEVICE_TYPE
 {
     VIDEO_CAPTURE_FILTER_DEVICE_TYPE_INVALID                = 0,            //!< Invalid
     VIDEO_CAPTURE_FILTER_DEVICE_TYPE_GAME_CAPTURE_HD        = 2,            //!< Game Capture HD   (VID: 0x0fd9 PID: 0x0044, 0x004e, 0x0051)
@@ -95,7 +95,7 @@
 };
 
 //! Input device
-typedef enum VIDEO_CAPTURE_FILTER_INPUT_DEVICE
+enum VIDEO_CAPTURE_FILTER_INPUT_DEVICE
 {
     VIDEO_CAPTURE_FILTER_INPUT_DEVICE_INVALID               =   0,          //!< Invalid
     VIDEO_CAPTURE_FILTER_INPUT_DEVICE_XBOX360               =   1,          //!< Microsoft Xbox 360
@@ -110,7 +110,7 @@
 };
 
 //! Video inputs
-typedef enum VIDEO_CAPTURE_FILTER_VIDEO_INPUT
+enum VIDEO_CAPTURE_FILTER_VIDEO_INPUT
 {
     VIDEO_CAPTURE_FILTER_VIDEO_INPUT_INVALID                =   0,          //!< Invalid
     VIDEO_CAPTURE_FILTER_VIDEO_INPUT_COMPOSITE              =   1,          //!< Composite
@@ -120,7 +120,7 @@
 };
 
 //! Video encoder profile
-typedef enum VIDEO_CAPTURE_FILTER_VID_ENC_PROFILE
+enum VIDEO_CAPTURE_FILTER_VID_ENC_PROFILE
 {
     VIDEO_CAPTURE_FILTER_VID_ENC_PROFILE_INVALID            = 0x00000000,   //!< Invalid
     VIDEO_CAPTURE_FILTER_VID_ENC_PROFILE_240                = 0x00000001,   //!< 320x240
@@ -131,7 +131,7 @@
 };
 
 //! Color range
-typedef enum VIDEO_CAPTURE_FILTER_COLOR_RANGE
+enum VIDEO_CAPTURE_FILTER_COLOR_RANGE
 {
     VIDEO_CAPTURE_FILTER_COLOR_RANGE_INVALID                =   0,          //!< Invalid
     VIDEO_CAPTURE_FILTER_COLOR_RANGE_FULL                   =   1,          //!< 0-255
@@ -140,7 +140,7 @@
 };
 
 //! Settings
-typedef struct _VIDEO_CAPTURE_FILTER_SETTINGS
+struct VIDEO_CAPTURE_FILTER_SETTINGS
 {
     TCHAR                                deviceName[256];                   //!< Device name (get only)
     VIDEO_CAPTURE_FILTER_INPUT_DEVICE    inputDevice;                       //!< Input device (e.g. Xbox360)
@@ -156,17 +156,16 @@
     int                                  digitalAudioGain;                  //!< Digital audio gain (-60 - 12 dB)
     BOOL                                 preserveInputFormat;               //!< Input Format will be preserved (e.g. do not convert interlaced to progressive)
     BOOL                                 stretchStandardDefinitionInput;    //!< Stretch SD input to 16:9
-}VIDEO_CAPTURE_FILTER_SETTINGS, *PVIDEO_CAPTURE_FILTER_SETTINGS;
-typedef const VIDEO_CAPTURE_FILTER_SETTINGS* PCVIDEO_CAPTURE_FILTER_SETTINGS;
+};
 
 //! Interface
 DECLARE_INTERFACE_(IElgatoVideoCaptureFilter2, IElgatoVideoCaptureFilter)
 {
     // Get current settings
-    STDMETHOD(GetSettings)(THIS_ PVIDEO_CAPTURE_FILTER_SETTINGS pSettings) PURE;
+    STDMETHOD(GetSettings)(THIS_ VIDEO_CAPTURE_FILTER_SETTINGS *pSettings) PURE;
 
     // Set settings
-    STDMETHOD(SetSettings)(THIS_ PCVIDEO_CAPTURE_FILTER_SETTINGS pcSettings) PURE;
+    STDMETHOD(SetSettings)(THIS_ const VIDEO_CAPTURE_FILTER_SETTINGS *pcSettings) PURE;
 };
 
 /*=============================================================================
@@ -186,7 +185,7 @@
 =============================================================================*/
 
 //! Messages
-typedef enum VIDEO_CAPTURE_FILTER_NOTIFICATION
+enum VIDEO_CAPTURE_FILTER_NOTIFICATION
 {
 	//! Description: Delay of the device has changed. Call GetDelayMs() to get the new delay.
     VIDEO_CAPTURE_FILTER_NOTIFICATION_DEVICE_DELAY_CHANGED              = 110,      //!< Data: none
@@ -222,19 +221,18 @@
 =============================================================================*/
 
 //! Extended Settings
-typedef struct _VIDEO_CAPTURE_FILTER_SETTINGS_EX
+struct VIDEO_CAPTURE_FILTER_SETTINGS_EX
 {
 	VIDEO_CAPTURE_FILTER_SETTINGS		Settings;
 	BOOL								enableFullFrameRate;				//!< Enable full frame rate (50/60 fps)
 	BYTE								reserved[20 * 1024];
-}VIDEO_CAPTURE_FILTER_SETTINGS_EX, *PVIDEO_CAPTURE_FILTER_SETTINGS_EX;
-typedef const VIDEO_CAPTURE_FILTER_SETTINGS_EX* PCVIDEO_CAPTURE_FILTER_SETTINGS_EX;
+};
 
 DECLARE_INTERFACE_(IElgatoVideoCaptureFilter5, IElgatoVideoCaptureFilter4)
 {
 	//! Get current settings
-	STDMETHOD(GetSettingsEx)(THIS_ PVIDEO_CAPTURE_FILTER_SETTINGS_EX pSettings) PURE;
+	STDMETHOD(GetSettingsEx)(THIS_ VIDEO_CAPTURE_FILTER_SETTINGS_EX *pSettings) PURE;
 
 	//! Set settings
-	STDMETHOD(SetSettingsEx)(THIS_ PCVIDEO_CAPTURE_FILTER_SETTINGS_EX pcSettings) PURE;
+	STDMETHOD(SetSettingsEx)(THIS_ const VIDEO_CAPTURE_FILTER_SETTINGS_EX *pcSettings) PURE;
 };

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/plugins/win-dshow/libdshowcapture/source/avermedia-encode.h -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/plugins/win-dshow/libdshowcapture/source/avermedia-encode.h Changed

@@ -1,32 +1,61 @@
-///////////////////////////////////////////////////////////////////////////////
-//
-// Copyright (c) 2014 AVerMedia Inc.
-// All rights reserved.
-//
-// Description:
-// This property is provide to 3rd party AP to use our HW encode function.
-//
-///////////////////////////////////////////////////////////////////////////////
-
+/*
+ * aver_prophwencode.h  --  This header filer is provide to 3rd party AP
+ * to use the HW encode function of AVerMedia.
+ *
+ * Copyright (C) 2014 AVerMedia TECHNOLOGIES, Inc.
+ *
+ * Authors: Morris Pan, AVerMedia TECHNOLOGIES, Inc. <morris.pan@avermedia.com>
+ *
+ * This content is released under the MIT License
+ * (http://opensource.org/licenses/MIT).
+ *
+ */
 #pragma once
 
 static const GUID AVER_HW_ENCODE_PROPERTY =
 {0x1bd55918, 0xbaf5, 0x4781, {0x8d, 0x76, 0xe0, 0xa0, 0xa5, 0xe1, 0xd2, 0xb8}};
 
 enum {
+	// @brief	PropertySet Enumeration
+	// param	AVER_PARAMETERS          
 	PROPERTY_HW_ENCODE_PARAMETER           = 0
 };
 
 enum {
+	// property to set/get the encode frame rate
+	// ulParam1 = Frames per second
 	AVER_PARAMETER_ENCODE_FRAME_RATE       = 0,
+
+	// property to set/get the encode bit rate
+	// ulParam1 = Bitrate (kb/s)
 	AVER_PARAMETER_ENCODE_BIT_RATE         = 1,
+
+	// property to get the output resolution
+	// ulParam1 = Resolution width
+	// ulParam2 = Resolution height
 	AVER_PARAMETER_CURRENT_RESOLUTION      = 2,
+
+	// property to set the output resolution
+	// ulParam1 = Resolution width
+	// ulParam2 = Resolution height
 	AVER_PARAMETER_ENCODE_RESOLUTION       = 3,
+
+	// property to set/get the encode GOP
+	// ulParam1 = GOP length
 	AVER_PARAMETER_ENCODE_GOP              = 4,
+
+	// property to insert an I frame to the encoded stream
 	AVER_PARAMETER_INSERT_I_FRAME          = 6
 };
 
 struct AVER_PARAMETERS {
+	// @brief   Use the PROPERTY_PARAMETER Property to Get or Set the
+	//          Device Parameter.
+	//
+	// param    ulIndex   Parameter Index (AVER_PARAMETER_*)
+	// param    ulParam1  Parameter 1 (if any)
+	// param    ulParam2  Parameter 2 (if any)
+	// param    ulParam3  Parameter 3 (if any)
 	ULONG ulIndex;
 	ULONG ulParam1;
 	ULONG ulParam2;

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/plugins/win-dshow/libdshowcapture/source/capture-filter.cpp -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/plugins/win-dshow/libdshowcapture/source/capture-filter.cpp Changed

@@ -40,6 +40,10 @@
 	connectedMediaType->majortype = info.expectedMajorType;
 }
 
+CapturePin::~CapturePin()
+{
+}
+
 STDMETHODIMP CapturePin::QueryInterface(REFIID riid, void **ppv)
 {
 	if (riid == IID_IUnknown) {
@@ -182,9 +186,13 @@
 	return NOERROR;
 }
 
+#define CAPTURE_PIN_NAME L"Capture Pin"
+
 STDMETHODIMP CapturePin::QueryId(LPWSTR *lpId)
 {
-	*lpId = L"Capture Pin";
+	wchar_t *str = (wchar_t*)CoTaskMemAlloc(sizeof(CAPTURE_PIN_NAME));
+	memcpy(str, CAPTURE_PIN_NAME, sizeof(CAPTURE_PIN_NAME));
+	*lpId = str;
 	return S_OK;
 }
 
@@ -340,6 +348,7 @@
 
 public:
 	inline MiscFlagsHandler() {}
+	virtual ~MiscFlagsHandler() {}
 
 	STDMETHODIMP QueryInterface(REFIID riid, void **ppv)
 	{
@@ -383,6 +392,10 @@
 {
 }
 
+CaptureFilter::~CaptureFilter()
+{
+}
+
 // IUnknown methods
 STDMETHODIMP CaptureFilter::QueryInterface(REFIID riid, void **ppv)
 {
@@ -528,12 +541,15 @@
 // ============================================================================
 
 CaptureEnumPins::CaptureEnumPins(CaptureFilter *filter_, CaptureEnumPins *pEnum)
-	: filter   (filter_),
-	  refCount (1)
+	: filter (filter_)
 {
 	curPin = (pEnum != nullptr) ? pEnum->curPin : 0;
 }
 
+CaptureEnumPins::~CaptureEnumPins()
+{
+}
+
 // IUnknown
 STDMETHODIMP CaptureEnumPins::QueryInterface(REFIID riid, void **ppv)
 {
@@ -603,8 +619,11 @@
 // ============================================================================
 
 CaptureEnumMediaTypes::CaptureEnumMediaTypes(CapturePin *pin_)
-	: pin      (pin_),
-	  refCount (1)
+	: pin (pin_)
+{
+}
+
+CaptureEnumMediaTypes::~CaptureEnumMediaTypes()
 {
 }

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/plugins/win-dshow/libdshowcapture/source/capture-filter.hpp -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/plugins/win-dshow/libdshowcapture/source/capture-filter.hpp Changed

@@ -42,7 +42,7 @@
 	volatile long          refCount;
 
 	PinCaptureInfo         captureInfo;
-	CComPtr<IPin>          connectedPin;
+	ComPtr<IPin>           connectedPin;
 	CaptureFilter          *filter;
 	MediaType              connectedMediaType;
 	volatile bool          flushing = false;
@@ -51,6 +51,7 @@
 
 public:
 	CapturePin(CaptureFilter *filter, const PinCaptureInfo &info);
+	virtual ~CapturePin();
 
 	STDMETHODIMP QueryInterface(REFIID riid, void **ppv);
 	STDMETHODIMP_(ULONG) AddRef();
@@ -91,13 +92,14 @@
 
 	volatile long         refCount;
 	FILTER_STATE          state;
-	CComPtr<IFilterGraph> graph;
-	CComPtr<CapturePin>   pin;
+	ComPtr<IFilterGraph>  graph;
+	ComPtr<CapturePin>    pin;
 
-	CComPtr<IAMFilterMiscFlags> misc;
+	ComPtr<IAMFilterMiscFlags> misc;
 
 public:
 	CaptureFilter(const PinCaptureInfo &info);
+	virtual ~CaptureFilter();
 
 	// IUnknown methods
 	STDMETHODIMP QueryInterface(REFIID riid, void **ppv);
@@ -126,12 +128,13 @@
 };
 
 class CaptureEnumPins : public IEnumPins {
-	volatile long          refCount;
-	CComPtr<CaptureFilter> filter;
+	volatile long          refCount = 1;
+	ComPtr<CaptureFilter>  filter;
 	UINT                   curPin;
 
 public:
 	CaptureEnumPins(CaptureFilter *filter, CaptureEnumPins *pEnum);
+	virtual ~CaptureEnumPins();
 
 	// IUnknown
 	STDMETHODIMP QueryInterface(REFIID riid, void **ppv);
@@ -146,12 +149,13 @@
 };
 
 class CaptureEnumMediaTypes : public IEnumMediaTypes {
-	volatile long       refCount;
-	CComPtr<CapturePin> pin;
+	volatile long       refCount = 1;
+	ComPtr<CapturePin>  pin;
 	UINT                curMT = 0;
 
 public:
 	CaptureEnumMediaTypes(CapturePin *pin);
+	virtual ~CaptureEnumMediaTypes();
 
 	// IUnknown
 	STDMETHODIMP QueryInterface(REFIID riid, void **ppv);

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/plugins/win-dshow/libdshowcapture/source/device.cpp -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/plugins/win-dshow/libdshowcapture/source/device.cpp Changed

@@ -209,7 +209,7 @@
 bool HDevice::SetupExceptionVideoCapture(IBaseFilter *filter,
 		VideoConfig &config)
 {
-	CComPtr<IPin> pin;
+	ComPtr<IPin> pin;
 
 	if (GetPinByName(filter, PINDIR_OUTPUT, L"656", &pin))
 		return SetupEncodedVideoCapture(filter, config, HD_PVR2);
@@ -222,7 +222,7 @@
 
 static bool GetPinMediaType(IPin *pin, MediaType &mt)
 {
-	CComPtr<IEnumMediaTypes> mediaTypes;
+	ComPtr<IEnumMediaTypes> mediaTypes;
 
 	if (SUCCEEDED(pin->EnumMediaTypes(&mediaTypes))) {
 		MediaTypePtr curMT;
@@ -241,7 +241,7 @@
 
 bool HDevice::SetupVideoCapture(IBaseFilter *filter, VideoConfig &config)
 {
-	CComPtr<IPin> pin;
+	ComPtr<IPin>  pin;
 	HRESULT       hr;
 	bool          success;
 
@@ -262,7 +262,7 @@
 		}
 	}
 
-	CComQIPtr<IAMStreamConfig> pinConfig(pin);
+	ComQIPtr<IAMStreamConfig> pinConfig(pin);
 	if (pinConfig == NULL) {
 		Error(L"Could not get IAMStreamConfig for device");
 		return false;
@@ -328,7 +328,7 @@
 
 bool HDevice::SetVideoConfig(VideoConfig *config)
 {
-	CComPtr<IBaseFilter> filter;
+	ComPtr<IBaseFilter> filter;
 
 	if (!EnsureInitialized(L"SetVideoConfig") ||
 	    !EnsureInactive(L"SetVideoConfig"))
@@ -372,7 +372,7 @@
 
 bool HDevice::SetupExceptionAudioCapture(IPin *pin)
 {
-	CComPtr<IEnumMediaTypes> enumMediaTypes;
+	ComPtr<IEnumMediaTypes>  enumMediaTypes;
 	ULONG                    count = 0;
 	HRESULT                  hr;
 	MediaTypePtr             mt;
@@ -397,7 +397,7 @@
 
 bool HDevice::SetupAudioCapture(IBaseFilter *filter, AudioConfig &config)
 {
-	CComPtr<IPin> pin;
+	ComPtr<IPin>  pin;
 	MediaTypePtr  defaultMT;
 	bool          success;
 	HRESULT       hr;
@@ -409,7 +409,7 @@
 		return false;
 	}
 
-	CComQIPtr<IAMStreamConfig> pinConfig(pin);
+	ComQIPtr<IAMStreamConfig> pinConfig(pin);
 
 	if (config.useDefaultConfig) {
 		MediaTypePtr defaultMT;
@@ -458,7 +458,7 @@
 
 bool HDevice::SetAudioConfig(AudioConfig *config)
 {
-	CComPtr<IBaseFilter> filter;
+	ComPtr<IBaseFilter> filter;
 
 	if (!EnsureInitialized(L"SetAudioConfig") ||
 	    !EnsureInactive(L"SetAudioConfig"))
@@ -493,8 +493,8 @@
 				config->name.c_str(), config->path.c_str(),
 				&filter);
 		if (!success) {
-			Error(L"Audio device '%s': %s not found", config->name,
-					config->path);
+			Error(L"Audio device '%s': %s not found", config->name.c_str(),
+					config->path.c_str());
 			return false;
 		}
 	}
@@ -534,7 +534,7 @@
 		IBaseFilter *filter, CaptureFilter *capture)
 {
 	HRESULT hr;
-	CComPtr<IPin> filterPin;
+	ComPtr<IPin> filterPin;
 
 	if (!EnsureInitialized(L"HDevice::ConnectPins") ||
 	    !EnsureInactive(L"HDevice::ConnectPins"))
@@ -614,7 +614,7 @@
 
 void HDevice::DisconnectFilters()
 {
-	CComPtr<IEnumFilters> filterEnum;
+	ComPtr<IEnumFilters>  filterEnum;
 	HRESULT               hr;
 
 	if (!graph)
@@ -624,11 +624,10 @@
 	if (FAILED(hr))
 		return;
 
-	CComPtr<IBaseFilter> filter;
+	ComPtr<IBaseFilter> filter;
 	while (filterEnum->Next(1, &filter, nullptr) == S_OK) {
 		graph->RemoveFilter(filter);
 		filterEnum->Reset();
-		filter.Release();
 	}
 }

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/plugins/win-dshow/libdshowcapture/source/device.hpp -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/plugins/win-dshow/libdshowcapture/source/device.hpp Changed

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/plugins/win-dshow/libdshowcapture/source/dshow-base.cpp -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/plugins/win-dshow/libdshowcapture/source/dshow-base.cpp Changed

@@ -33,9 +33,9 @@
 bool CreateFilterGraph(IGraphBuilder **pgraph, ICaptureGraphBuilder2 **pbuilder,
 		IMediaControl **pcontrol)
 {
-	CComPtr<IGraphBuilder> graph;
-	CComPtr<ICaptureGraphBuilder2> builder;
-	CComPtr<IMediaControl> control;
+	ComPtr<IGraphBuilder> graph;
+	ComPtr<ICaptureGraphBuilder2> builder;
+	ComPtr<IMediaControl> control;
 	HRESULT hr;
 
 	hr = CoCreateInstance(CLSID_FilterGraph, NULL, CLSCTX_INPROC_SERVER,
@@ -73,8 +73,8 @@
 
 void LogFilters(IGraphBuilder *graph)
 {
-	CComPtr<IEnumFilters> filterEnum;
-	CComPtr<IBaseFilter>  filter;
+	ComPtr<IEnumFilters> filterEnum;
+	ComPtr<IBaseFilter>  filter;
 	HRESULT hr;
 
 	hr = graph->EnumFilters(&filterEnum);
@@ -93,13 +93,11 @@
 
 			Debug(L"\t%s", filterInfo.achName);
 		}
-
-		filter.Release();
 	}
 }
 
 struct DeviceFilterCallbackInfo {
-	CComPtr<IBaseFilter> filter;
+	ComPtr<IBaseFilter>  filter;
 	const wchar_t        *name;
 	const wchar_t        *path;
 };
@@ -141,7 +139,7 @@
 static bool PinConfigHasMajorType(IPin *pin, const GUID &type)
 {
 	HRESULT hr;
-	CComPtr<IAMStreamConfig> config;
+	ComPtr<IAMStreamConfig> config;
 	int count, size;
 
 	hr = pin->QueryInterface(IID_IAMStreamConfig, (void**)&config);
@@ -170,7 +168,7 @@
 {
 	HRESULT hr;
 	MediaTypePtr mt;
-	CComPtr<IEnumMediaTypes> mediaEnum;
+	ComPtr<IEnumMediaTypes> mediaEnum;
 
 	/* first, check the config caps. */
 	if (PinConfigHasMajorType(pin, type))
@@ -202,7 +200,7 @@
 	if (!pin)
 		return E_POINTER;
 
-	CComQIPtr<IKsPropertySet> propertySet(pin);
+	ComQIPtr<IKsPropertySet>  propertySet(pin);
 	DWORD                     size;
 
 	if (propertySet == NULL)
@@ -258,8 +256,8 @@
 bool GetFilterPin(IBaseFilter *filter, const GUID &type, const GUID &category,
 		PIN_DIRECTION dir, IPin **pin)
 {
-	CComPtr<IPin>      curPin;
-	CComPtr<IEnumPins> pinsEnum;
+	ComPtr<IPin>       curPin;
+	ComPtr<IEnumPins>  pinsEnum;
 	ULONG              num;
 
 	if (!filter)
@@ -274,8 +272,6 @@
 			(*pin)->AddRef();
 			return true;
 		}
-
-		curPin.Release();
 	}
 
 	return false;
@@ -284,8 +280,8 @@
 bool GetPinByName(IBaseFilter *filter, PIN_DIRECTION dir, const wchar_t *name,
 		IPin **pin)
 {
-	CComPtr<IPin>      curPin;
-	CComPtr<IEnumPins> pinsEnum;
+	ComPtr<IPin>       curPin;
+	ComPtr<IEnumPins>  pinsEnum;
 	ULONG              num;
 
 	if (!filter)
@@ -300,8 +296,6 @@
 			*pin = curPin.Detach();
 			return true;
 		}
-
-		curPin.Release();
 	}
 
 	return false;
@@ -309,8 +303,8 @@
 
 bool GetPinByMedium(IBaseFilter *filter, REGPINMEDIUM &medium, IPin **pin)
 {
-	CComPtr<IPin>      curPin;
-	CComPtr<IEnumPins> pinsEnum;
+	ComPtr<IPin>       curPin;
+	ComPtr<IEnumPins>  pinsEnum;
 	ULONG              num;
 
 	if (!filter)
@@ -326,8 +320,6 @@
 			*pin = curPin.Detach();
 			return true;
 		}
-
-		curPin.Release();
 	}
 
 	return false;
@@ -336,13 +328,13 @@
 static bool GetFilterByMediumFromMoniker(IMoniker *moniker,
 		REGPINMEDIUM &medium, IBaseFilter **filter)
 {
-	CComPtr<IBaseFilter> curFilter;
+	ComPtr<IBaseFilter>  curFilter;
 	HRESULT              hr;
 
 	hr = moniker->BindToObject(nullptr, nullptr, IID_IBaseFilter,
 			(void**)&curFilter);
 	if (SUCCEEDED(hr)) {
-		CComPtr<IPin> pin;
+		ComPtr<IPin> pin;
 		if (GetPinByMedium(curFilter, medium, &pin)) {
 			*filter = curFilter.Detach();
 			return true;
@@ -358,9 +350,9 @@
 bool GetFilterByMedium(const CLSID &id, REGPINMEDIUM &medium,
 		IBaseFilter **filter)
 {
-	CComPtr<ICreateDevEnum> deviceEnum;
-	CComPtr<IEnumMoniker>   enumMoniker;
-	CComPtr<IMoniker>       moniker;
+	ComPtr<ICreateDevEnum>  deviceEnum;
+	ComPtr<IEnumMoniker>    enumMoniker;
+	ComPtr<IMoniker>        moniker;
 	DWORD                   count = 0;
 	HRESULT                 hr;
 
@@ -385,8 +377,6 @@
 	while (enumMoniker->Next(1, &moniker, &count) == S_OK) {
 		if (GetFilterByMediumFromMoniker(moniker, medium, filter))
 			return true;
-
-		moniker.Release();
 	}
 
 	return false;
@@ -394,7 +384,7 @@
 
 bool GetPinMedium(IPin *pin, REGPINMEDIUM &medium)
 {
-	CComQIPtr<IKsPin>             ksPin(pin);
+	ComQIPtr<IKsPin>              ksPin(pin);
 	CoTaskMemPtr<KSMULTIPLE_ITEM> items;
 
 	if (!ksPin)
@@ -418,15 +408,15 @@
 
 static inline bool PinIsConnected(IPin *pin)
 {
-	CComPtr<IPin> connectedPin;
+	ComPtr<IPin> connectedPin;
 	return SUCCEEDED(pin->ConnectedTo(&connectedPin));
 }
 
 static bool DirectConnectOutputPin(IFilterGraph *graph, IPin *pin,
 		IBaseFilter *filterIn)
 {
-	CComPtr<IPin>      curPin;
-	CComPtr<IEnumPins> pinsEnum;
+	ComPtr<IPin>       curPin;
+	ComPtr<IEnumPins>  pinsEnum;
 	ULONG              num;
 
 	if (!graph || !filterIn || !pin)
@@ -441,8 +431,6 @@
 			if (graph->ConnectDirect(pin, curPin, nullptr) == S_OK)
 				return true;
 		}
-
-		curPin.Release();
 	}

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/plugins/win-dshow/libdshowcapture/source/dshow-base.hpp -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/plugins/win-dshow/libdshowcapture/source/dshow-base.hpp Changed

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/plugins/win-dshow/libdshowcapture/source/dshow-demux.cpp -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/plugins/win-dshow/libdshowcapture/source/dshow-demux.cpp Changed

@@ -43,14 +43,14 @@
 		long width, long height, long long frameTime,
 		VideoFormat format)
 {
-	CComQIPtr<IMpeg2Demultiplexer> demuxer(demuxFilter);
+	ComQIPtr<IMpeg2Demultiplexer> demuxer(demuxFilter);
 	if (!demuxer) {
 		Warning(L"CreateDemuxVideoPin: Failed to get "
 		        L"IMpeg2Demultiplexer from filter");
 		return false;
 	}
 
-	CComPtr<IPin> pin;
+	ComPtr<IPin>  pin;
 	HRESULT       hr;
 
 	VIDEOINFOHEADER *vih           = mt.AllocFormat<VIDEOINFOHEADER>();
@@ -72,7 +72,10 @@
 	mt->formattype           = FORMAT_VideoInfo;
 	mt->bTemporalCompression = true;
 
-	hr = demuxer->CreateOutputPin(mt, DEMUX_VIDEO_PIN, &pin);
+	wchar_t *name = (wchar_t*)CoTaskMemAlloc(sizeof(DEMUX_VIDEO_PIN));
+	memcpy(name, DEMUX_VIDEO_PIN, sizeof(DEMUX_VIDEO_PIN));
+
+	hr = demuxer->CreateOutputPin(mt, name, &pin);
 	if (FAILED(hr)) {
 		WarningHR(L"CreateDemuxVideoPin: Failed to create video pin "
 		          L"on demuxer", hr);
@@ -110,14 +113,14 @@
 		DWORD samplesPerSec, WORD bitsPerSample, WORD channels,
 		AudioFormat format)
 {
-	CComQIPtr<IMpeg2Demultiplexer> demuxer(demuxFilter);
+	ComQIPtr<IMpeg2Demultiplexer> demuxer(demuxFilter);
 	if (!demuxer) {
 		Warning(L"CreateDemuxAudioPin: Failed to get "
 		        L"IMpeg2Demultiplexer from filter");
 		return false;
 	}
 
-	CComPtr<IPin> pin;
+	ComPtr<IPin>  pin;
 	HRESULT       hr;
 
 	WAVEFORMATEX *wfex   = mt.AllocFormat<WAVEFORMATEX>();
@@ -136,7 +139,10 @@
 	mt->formattype           = FORMAT_WaveFormatEx;
 	mt->bTemporalCompression = true;
 
-	hr = demuxer->CreateOutputPin(mt, DEMUX_AUDIO_PIN, &pin);
+	wchar_t *name = (wchar_t*)CoTaskMemAlloc(sizeof(DEMUX_AUDIO_PIN));
+	memcpy(name, DEMUX_AUDIO_PIN, sizeof(DEMUX_AUDIO_PIN));
+
+	hr = demuxer->CreateOutputPin(mt, name, &pin);
 	if (FAILED(hr)) {
 		WarningHR(L"CreateDemuxAudioPin: Failed to create audio pin "
 		          L"on demuxer", hr);

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/plugins/win-dshow/libdshowcapture/source/dshow-encoded-device.cpp -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/plugins/win-dshow/libdshowcapture/source/dshow-encoded-device.cpp Changed

@@ -31,8 +31,8 @@
 		IBaseFilter **crossbar, IBaseFilter **encoder,
 		IBaseFilter **demuxer)
 {
-	CComPtr<IPin> inputPin;
-	CComPtr<IPin> outputPin;
+	ComPtr<IPin>  inputPin;
+	ComPtr<IPin>  outputPin;
 	REGPINMEDIUM  inMedium;
 	REGPINMEDIUM  outMedium;
 	bool          hasOutMedium;
@@ -109,7 +109,7 @@
 
 static inline bool MapPacketIDs(IBaseFilter *demuxer, ULONG video, ULONG audio)
 {
-	CComPtr<IPin> videoPin, audioPin;
+	ComPtr<IPin>  videoPin, audioPin;
 	HRESULT       hr;
 
 	if (!GetPinByName(demuxer, PINDIR_OUTPUT, DEMUX_VIDEO_PIN, &videoPin)) {
@@ -174,7 +174,7 @@
 	RocketInstStruct   rocketInstance   = {};
 	RocketPropStruct   rocketProperty   = {};
 
-	CComQIPtr<IKsPropertySet> propertySet(encoder);
+	ComQIPtr<IKsPropertySet> propertySet(encoder);
 	if (!propertySet)
 		return false;
 
@@ -194,9 +194,9 @@
 			VideoConfig &config,
 			const EncodedDevice &info)
 {
-	CComPtr<IBaseFilter> crossbar;
-	CComPtr<IBaseFilter> encoder;
-	CComPtr<IBaseFilter> demuxer;
+	ComPtr<IBaseFilter>  crossbar;
+	ComPtr<IBaseFilter>  encoder;
+	ComPtr<IBaseFilter>  demuxer;
 	MediaType            mtVideo;
 	MediaType            mtAudio;

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/plugins/win-dshow/libdshowcapture/source/dshow-enum.cpp -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/plugins/win-dshow/libdshowcapture/source/dshow-enum.cpp Changed

@@ -36,7 +36,7 @@
 
 static void EnumElgatoCaps(IPin *pin, EnumCapsCallback callback, void *param)
 {
-	CComPtr<IEnumMediaTypes> mediaTypes;
+	ComPtr<IEnumMediaTypes> mediaTypes;
 
 	if (SUCCEEDED(pin->EnumMediaTypes(&mediaTypes))) {
 		MediaTypePtr mt;
@@ -52,7 +52,7 @@
 static bool EnumPinCaps(IPin *pin, EnumCapsCallback callback, void *param)
 {
 	HRESULT hr;
-	CComQIPtr<IAMStreamConfig> config(pin);
+	ComQIPtr<IAMStreamConfig> config(pin);
 	int count, size;
 
 	if (config == NULL)
@@ -152,6 +152,9 @@
 	long long   bestVal;
 	bool        found;
 
+	ClosestVideoData &operator=(ClosestVideoData const&) = delete;
+	ClosestVideoData &operator=(ClosestVideoData&&) = delete;
+
 	inline ClosestVideoData(VideoConfig &config, MediaType &mt)
 		: config     (config),
 		  mt         (mt),
@@ -236,7 +239,7 @@
 bool GetClosestVideoMediaType(IBaseFilter *filter, VideoConfig &config,
 		MediaType &mt)
 {
-	CComPtr<IPin>    pin;
+	ComPtr<IPin>     pin;
 	ClosestVideoData data(config, mt);
 	bool             success;
 
@@ -263,6 +266,9 @@
 	int         bestVal;
 	bool        found;
 
+	ClosestAudioData &operator=(ClosestAudioData const&) = delete;
+	ClosestAudioData &operator=(ClosestAudioData&&) = delete;
+
 	inline ClosestAudioData(AudioConfig &config, MediaType &mt)
 		: config     (config),
 		  mt         (mt),
@@ -274,7 +280,7 @@
 static bool ClosestAudioMTCallback(ClosestAudioData &data,
 		const AM_MEDIA_TYPE &mt, const BYTE *capData)
 {
-	AudioInfo info;
+	AudioInfo info = {};
 
 	if (mt.formattype == FORMAT_WaveFormatEx)
 		Get_FORMAT_WaveFormatEx_Data(info, mt, capData);
@@ -338,7 +344,7 @@
 bool GetClosestAudioMediaType(IBaseFilter *filter, AudioConfig &config,
 		MediaType &mt)
 {
-	CComPtr<IPin>    pin;
+	ComPtr<IPin>     pin;
 	ClosestAudioData data(config, mt);
 	bool             success;
 
@@ -397,8 +403,8 @@
 static bool EnumDevice(IMoniker *deviceInfo, EnumDeviceCallback callback,
 		void *param)
 {
-	CComPtr<IPropertyBag> propertyData;
-	CComPtr<IBaseFilter>  filter;
+	ComPtr<IPropertyBag> propertyData;
+	ComPtr<IBaseFilter>  filter;
 	HRESULT hr;
 
 	hr = deviceInfo->BindToStorage(0, 0, IID_IPropertyBag,
@@ -430,7 +436,7 @@
 
 static bool EnumExceptionVideoDevices(EnumDeviceCallback callback, void *param)
 {
-	CComPtr<IBaseFilter> filter;
+	ComPtr<IBaseFilter>  filter;
 	HRESULT              hr;
 
 	hr = CoCreateInstance(CLSID_ElgatoVideoCaptureFilter, nullptr,
@@ -446,9 +452,9 @@
 
 bool EnumDevices(const GUID &type, EnumDeviceCallback callback, void *param)
 {
-	CComPtr<ICreateDevEnum> deviceEnum;
-	CComPtr<IEnumMoniker>   enumMoniker;
-	CComPtr<IMoniker>       deviceInfo;
+	ComPtr<ICreateDevEnum>  deviceEnum;
+	ComPtr<IEnumMoniker>    enumMoniker;
+	ComPtr<IMoniker>        deviceInfo;
 	HRESULT                 hr;
 	DWORD                   count = 0;
 
@@ -471,8 +477,6 @@
 		while (enumMoniker->Next(1, &deviceInfo, &count) == S_OK) {
 			if (!EnumDevice(deviceInfo, callback, param))
 				return true;
-
-			deviceInfo.Release();
 		}
 	}

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/plugins/win-dshow/libdshowcapture/source/dshow-formats.cpp -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/plugins/win-dshow/libdshowcapture/source/dshow-formats.cpp Changed

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/plugins/win-dshow/libdshowcapture/source/dshowcapture.cpp -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/plugins/win-dshow/libdshowcapture/source/dshowcapture.cpp Changed

@@ -125,7 +125,7 @@
 	if (!propertyObject)
 		return;
 
-	CComQIPtr<ISpecifyPropertyPages> pages(propertyObject);
+	ComQIPtr<ISpecifyPropertyPages> pages(propertyObject);
 	CAUUID cauuid;
 
 	if (pages != NULL) {
@@ -141,7 +141,7 @@
 
 void Device::OpenDialog(void *hwnd, DialogType type) const
 {
-	CComPtr<IUnknown> ptr;
+	ComPtr<IUnknown>  ptr;
 	HRESULT           hr;
 
 	if (type == DialogType::ConfigVideo) {
@@ -157,8 +157,8 @@
 		}
 
 		if (ptr != NULL && type == DialogType::ConfigCrossbar2) {
-			CComQIPtr<IAMCrossbar> xbar(ptr);
-			CComQIPtr<IBaseFilter> filter(xbar);
+			ComQIPtr<IAMCrossbar> xbar(ptr);
+			ComQIPtr<IBaseFilter> filter(xbar);
 
 			hr = context->builder->FindInterface(
 					&LOOK_UPSTREAM_ONLY,
@@ -208,7 +208,7 @@
 		const wchar_t *deviceName,
 		const wchar_t *devicePath)
 {
-	CComPtr<IPin> pin;
+	ComPtr<IPin> pin;
 
 	if (GetPinByName(filter, PINDIR_OUTPUT, L"656", &pin))
 		EnumEncodedVideo(devices, deviceName, devicePath, HD_PVR2);
@@ -222,8 +222,8 @@
 		const wchar_t *deviceName,
 		const wchar_t *devicePath)
 {
-	CComPtr<IPin> pin;
-	CComPtr<IPin> audioPin;
+	ComPtr<IPin>  pin;
+	ComPtr<IPin>  audioPin;
 	VideoDevice   info;
 
 	if (wcsstr(deviceName, L"Hauppauge HD PVR Capture") != nullptr) {
@@ -269,7 +269,7 @@
 		const wchar_t *deviceName,
 		const wchar_t *devicePath)
 {
-	CComPtr<IPin> pin;
+	ComPtr<IPin>  pin;
 	AudioDevice   info;
 
 	bool success = GetFilterPin(filter, MEDIATYPE_Audio,

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/plugins/win-dshow/libdshowcapture/source/encoder.cpp -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/plugins/win-dshow/libdshowcapture/source/encoder.cpp Changed

@@ -30,7 +30,7 @@
 
 HVideoEncoder::~HVideoEncoder()
 {
-	CComPtr<IEnumFilters> filterEnum;
+	ComPtr<IEnumFilters> filterEnum;
 	IBaseFilter *filter;
 	HRESULT hr;
 
@@ -54,10 +54,10 @@
 
 bool HVideoEncoder::ConnectFilters()
 {
-	CComPtr<IPin> deviceIn;
-	CComPtr<IPin> deviceOut;
-	CComPtr<IPin> encoderIn;
-	CComPtr<IPin> encoderOut;
+	ComPtr<IPin> deviceIn;
+	ComPtr<IPin> deviceOut;
+	ComPtr<IPin> encoderIn;
+	ComPtr<IPin> encoderOut;
 	bool success;
 	HRESULT hr;
 
@@ -110,7 +110,7 @@
 
 static bool GetPinFirstMediaType(IPin *pin, AM_MEDIA_TYPE **mt)
 {
-	CComPtr<IEnumMediaTypes>       mediaEnum;
+	ComPtr<IEnumMediaTypes>        mediaEnum;
 	HRESULT                        hr;
 	ULONG                          fetched;
 
@@ -130,8 +130,8 @@
 
 bool HVideoEncoder::SetupCrossbar()
 {
-	CComPtr<IBaseFilter> crossbar;
-	CComPtr<IPin> pin;
+	ComPtr<IBaseFilter> crossbar;
+	ComPtr<IPin> pin;
 	REGPINMEDIUM medium;
 
 	/* C353 has no crossbar */
@@ -199,9 +199,9 @@
 
 bool HVideoEncoder::SetupEncoder(IBaseFilter *filter)
 {
-	CComPtr<IBaseFilter>           deviceFilter;
-	CComPtr<IPin>                  inputPin;
-	CComPtr<IPin>                  outputPin;
+	ComPtr<IBaseFilter>            deviceFilter;
+	ComPtr<IPin>                   inputPin;
+	ComPtr<IPin>                   outputPin;
 	REGPINMEDIUM                   medium;
 	MediaTypePtr                   mtRaw;
 	MediaTypePtr                   mtEncoded;
@@ -296,7 +296,7 @@
 {
 	HRESULT hr;
 
-	CComQIPtr<IKsPropertySet> propertySet(encoder);
+	ComQIPtr<IKsPropertySet> propertySet(encoder);
 	if (!propertySet) {
 		Warning(L"Could not get IKsPropertySet for encoder");
 		return false;
@@ -350,8 +350,8 @@
 
 bool HVideoEncoder::SetConfig(VideoEncoderConfig &config)
 {
-	CComPtr<IBaseFilter> filter;
-	CComPtr<IBaseFilter> crossbar;
+	ComPtr<IBaseFilter> filter;
+	ComPtr<IBaseFilter> crossbar;
 
 	if (config.name.empty() && config.path.empty()) {
 		Warning(L"No video encoder name or path specified");

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/plugins/win-dshow/libdshowcapture/source/encoder.hpp -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/plugins/win-dshow/libdshowcapture/source/encoder.hpp Changed

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/plugins/win-dshow/libdshowcapture/source/output-filter.cpp -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/plugins/win-dshow/libdshowcapture/source/output-filter.cpp Changed

@@ -39,6 +39,10 @@
 {
 }
 
+OutputPin::~OutputPin()
+{
+}
+
 STDMETHODIMP OutputPin::QueryInterface(REFIID riid, void **ppv)
 {
 	if (riid == IID_IUnknown) {
@@ -88,7 +92,7 @@
 
 	hr = pReceivePin->ReceiveConnection(this, outputInfo.mt);
 	if (FAILED(hr)) {
-		CComPtr<IEnumMediaTypes> enumMT;
+		ComPtr<IEnumMediaTypes> enumMT;
 		pReceivePin->EnumMediaTypes(&enumMT);
 
 		if (enumMT) {
@@ -103,13 +107,12 @@
 		return E_FAIL;
 	}
 
-	CComQIPtr<IMemInputPin> memInput(pReceivePin);
+	ComQIPtr<IMemInputPin> memInput(pReceivePin);
 	if (!memInput)
 		return E_FAIL;
 
 	if (!!allocator) {
 		allocator->Decommit();
-		allocator.Release();
 	}
 
 	hr = memInput->GetAllocator(&allocator);
@@ -173,7 +176,6 @@
 
 	if (!!allocator) {
 		allocator->Decommit();
-		allocator.Release();
 	}
 
 	connectedPin = nullptr;
@@ -229,9 +231,13 @@
 	return NOERROR;
 }
 
+#define OUTPUT_PIN_NAME L"Output Pin"
+
 STDMETHODIMP OutputPin::QueryId(LPWSTR *lpId)
 {
-	*lpId = L"Output Pin";
+	wchar_t *str = (wchar_t*)CoTaskMemAlloc(sizeof(OUTPUT_PIN_NAME));
+	memcpy(str, OUTPUT_PIN_NAME, sizeof(OUTPUT_PIN_NAME));
+	*lpId = str;
 	return S_OK;
 }
 
@@ -318,10 +324,10 @@
 		size_t linesize[DSHOW_MAX_PLANES],
 		long long timestampStart, long long timestampEnd)
 {
-	CComQIPtr<IMemInputPin> memInput(connectedPin);
+	ComQIPtr<IMemInputPin> memInput(connectedPin);
 	REFERENCE_TIME startTime = timestampStart;
 	REFERENCE_TIME endTime = timestampEnd;
-	CComPtr<IMediaSample> sample;
+	ComPtr<IMediaSample> sample;
 	HRESULT hr;
 	BYTE *ptr;
 
@@ -375,6 +381,7 @@
 
 public:
 	inline SourceMiscFlags() {}
+	virtual ~SourceMiscFlags() {}
 
 	STDMETHODIMP QueryInterface(REFIID riid, void **ppv)
 	{
@@ -418,6 +425,10 @@
 {
 }
 
+OutputFilter::~OutputFilter()
+{
+}
+
 // IUnknown methods
 STDMETHODIMP OutputFilter::QueryInterface(REFIID riid, void **ppv)
 {
@@ -567,12 +578,15 @@
 // ============================================================================
 
 OutputEnumPins::OutputEnumPins(OutputFilter *filter_, OutputEnumPins *pEnum)
-	: filter   (filter_),
-	  refCount (1)
+	: filter (filter_)
 {
 	curPin = (pEnum != nullptr) ? pEnum->curPin : 0;
 }
 
+OutputEnumPins::~OutputEnumPins()
+{
+}
+
 // IUnknown
 STDMETHODIMP OutputEnumPins::QueryInterface(REFIID riid, void **ppv)
 {
@@ -642,8 +656,11 @@
 // ============================================================================
 
 OutputEnumMediaTypes::OutputEnumMediaTypes(OutputPin *pin_)
-	: pin      (pin_),
-	  refCount (1)
+	: pin (pin_)
+{
+}
+
+OutputEnumMediaTypes::~OutputEnumMediaTypes()
 {
 }

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/plugins/win-dshow/libdshowcapture/source/output-filter.hpp -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/plugins/win-dshow/libdshowcapture/source/output-filter.hpp Changed

@@ -41,16 +41,17 @@
 	volatile long                  refCount;
 
 	PinOutputInfo                  outputInfo;
-	CComPtr<IPin>                  connectedPin;
+	ComPtr<IPin>                   connectedPin;
 	OutputFilter                   *filter;
 	volatile bool                  flushing = false;
-	CComPtr<IMemAllocator>         allocator;
+	ComPtr<IMemAllocator>          allocator;
 	size_t                         bufSize;
 
 	bool IsValidMediaType(const AM_MEDIA_TYPE *pmt) const;
 
 public:
 	OutputPin(OutputFilter *filter, const PinOutputInfo &info);
+	virtual ~OutputPin();
 
 	STDMETHODIMP QueryInterface(REFIID riid, void **ppv);
 	STDMETHODIMP_(ULONG) AddRef();
@@ -89,13 +90,14 @@
 
 	volatile long                  refCount;
 	FILTER_STATE                   state;
-	CComPtr<IFilterGraph>          graph;
-	CComPtr<OutputPin>             pin;
+	ComPtr<IFilterGraph>           graph;
+	ComPtr<OutputPin>              pin;
 
-	CComPtr<IAMFilterMiscFlags>    misc;
+	ComPtr<IAMFilterMiscFlags>     misc;
 
 public:
 	OutputFilter(const PinOutputInfo &info);
+	virtual ~OutputFilter();
 
 	// IUnknown methods
 	STDMETHODIMP QueryInterface(REFIID riid, void **ppv);
@@ -131,12 +133,13 @@
 };
 
 class OutputEnumPins : public IEnumPins {
-	volatile long                  refCount;
-	CComPtr<OutputFilter>          filter;
+	volatile long                  refCount = 1;
+	ComPtr<OutputFilter>           filter;
 	UINT                           curPin;
 
 public:
 	OutputEnumPins(OutputFilter *filter, OutputEnumPins *pEnum);
+	virtual ~OutputEnumPins();
 
 	// IUnknown
 	STDMETHODIMP QueryInterface(REFIID riid, void **ppv);
@@ -151,12 +154,13 @@
 };
 
 class OutputEnumMediaTypes : public IEnumMediaTypes {
-	volatile long                  refCount;
-	CComPtr<OutputPin>             pin;
+	volatile long                  refCount = 1;
+	ComPtr<OutputPin>              pin;
 	UINT                           curMT = 0;
 
 public:
 	OutputEnumMediaTypes(OutputPin *pin);
+	virtual ~OutputEnumMediaTypes();
 
 	// IUnknown
 	STDMETHODIMP QueryInterface(REFIID riid, void **ppv);

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/plugins/win-dshow/libdshowcapture/vs/2013/dshowcapture/dshowcapture.vcxproj -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/plugins/win-dshow/libdshowcapture/vs/2013/dshowcapture/dshowcapture.vcxproj Changed

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/plugins/win-dshow/libdshowcapture/vs/2013/dshowcapture/dshowcapture.vcxproj.filters -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/plugins/win-dshow/libdshowcapture/vs/2013/dshowcapture/dshowcapture.vcxproj.filters Changed

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/plugins/win-dshow/win-dshow.cpp -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/plugins/win-dshow/win-dshow.cpp Changed

@@ -39,6 +39,8 @@
 #define BUFFERING_VAL     "buffering"
 #define USE_CUSTOM_AUDIO  "use_custom_audio_device"
 #define AUDIO_DEVICE_ID   "audio_device_id"
+#define COLOR_SPACE       "color_space"
+#define COLOR_RANGE       "color_range"
 
 #define TEXT_INPUT_NAME     obs_module_text("VideoCaptureDevice")
 #define TEXT_DEVICE         obs_module_text("Device")
@@ -60,6 +62,11 @@
 #define TEXT_AUDIO_DEVICE   obs_module_text("AudioDevice")
 #define TEXT_ACTIVATE       obs_module_text("Activate")
 #define TEXT_DEACTIVATE     obs_module_text("Deactivate")
+#define TEXT_COLOR_SPACE    obs_module_text("ColorSpace")
+#define TEXT_COLOR_DEFAULT  obs_module_text("ColorSpace.Default")
+#define TEXT_COLOR_RANGE    obs_module_text("ColorRange")
+#define TEXT_RANGE_PARTIAL  obs_module_text("ColorRange.Partial")
+#define TEXT_RANGE_FULL     obs_module_text("ColorRange.Full")
 
 enum ResType {
 	ResType_Preferred,
@@ -223,6 +230,8 @@
 	bool UpdateVideoConfig(obs_data_t *settings);
 	bool UpdateAudioConfig(obs_data_t *settings);
 	void SetActive(bool active);
+	inline enum video_colorspace GetColorSpace(obs_data_t *settings) const;
+	inline enum video_range_type GetColorRange(obs_data_t *settings) const;
 	inline void Activate(obs_data_t *settings);
 	inline void Deactivate();
 
@@ -569,6 +578,9 @@
 	return ConvertRes(cx, cy, res.c_str());
 }
 
+template <typename ... F>
+static bool CapsMatch(const VideoDevice &dev, F ... fs);
+
 template <typename F, typename ... Fs>
 static inline bool CapsMatch(const VideoInfo &info, F&& f, Fs ... fs)
 {
@@ -828,6 +840,29 @@
 	obs_data_release(settings);
 }
 
+inline enum video_colorspace DShowInput::GetColorSpace(
+		obs_data_t *settings) const
+{
+	const char *space = obs_data_get_string(settings, COLOR_SPACE);
+
+	if (astrcmpi(space, "709") == 0)
+		return VIDEO_CS_709;
+	else if (astrcmpi(space, "601") == 0)
+		return VIDEO_CS_601;
+	else
+		return (videoConfig.format == VideoFormat::HDYC) ?
+			VIDEO_CS_709 : VIDEO_CS_601;
+}
+
+inline enum video_range_type DShowInput::GetColorRange(
+		obs_data_t *settings) const
+{
+	const char *range = obs_data_get_string(settings, COLOR_RANGE);
+
+	return astrcmpi(range, "full") == 0 ?
+		VIDEO_RANGE_FULL : VIDEO_RANGE_PARTIAL;
+}
+
 inline void DShowInput::Activate(obs_data_t *settings)
 {
 	if (!device.ResetGraph())
@@ -849,13 +884,14 @@
 	if (device.Start() != Result::Success)
 		return;
 
-	enum video_colorspace cs = (videoConfig.format == VideoFormat::HDYC) ?
-		VIDEO_CS_709 : VIDEO_CS_601;
+	enum video_colorspace cs = GetColorSpace(settings);
 
-	if (!video_format_get_parameters(cs, VIDEO_RANGE_PARTIAL,
+	bool success = video_format_get_parameters(
+			cs, GetColorRange(settings),
 			frame.color_matrix,
 			frame.color_range_min,
-			frame.color_range_max)) {
+			frame.color_range_max);
+	if (!success) {
 		blog(LOG_ERROR, "Failed to get video format parameters for " \
 		                "video format %u", cs);
 	}
@@ -907,6 +943,8 @@
 	obs_data_set_default_int(settings, FRAME_INTERVAL, FPS_MATCHING);
 	obs_data_set_default_int(settings, RES_TYPE, ResType_Preferred);
 	obs_data_set_default_int(settings, VIDEO_FORMAT, (int)VideoFormat::Any);
+	obs_data_set_default_string(settings, COLOR_SPACE, "default");
+	obs_data_set_default_string(settings, COLOR_RANGE, "partial");
 }
 
 struct Resolution {
@@ -1399,7 +1437,6 @@
 static bool UpdateFPS(long long interval, obs_property_t *list)
 {
 	size_t size = obs_property_list_item_count(list);
-	bool fps_found = false;
 	DStr name;
 
 	for (size_t i = 0; i < size; i++) {
@@ -1411,7 +1448,6 @@
 			return false;
 
 		dstr_cat(name, obs_property_list_item_name(list, i));
-		fps_found = true;
 		break;
 	}
 
@@ -1628,6 +1664,17 @@
 
 	obs_property_set_modified_callback(p, VideoFormatChanged);
 
+	p = obs_properties_add_list(ppts, COLOR_SPACE, TEXT_COLOR_SPACE,
+			OBS_COMBO_TYPE_LIST, OBS_COMBO_FORMAT_STRING);
+	obs_property_list_add_string(p, TEXT_COLOR_DEFAULT, "default");
+	obs_property_list_add_string(p, "709", "709");
+	obs_property_list_add_string(p, "601", "601");
+
+	p = obs_properties_add_list(ppts, COLOR_RANGE, TEXT_COLOR_RANGE,
+			OBS_COMBO_TYPE_LIST, OBS_COMBO_FORMAT_STRING);
+	obs_property_list_add_string(p, TEXT_RANGE_PARTIAL, "partial");
+	obs_property_list_add_string(p, TEXT_RANGE_FULL, "full");
+
 	p = obs_properties_add_list(ppts, BUFFERING_VAL, TEXT_BUFFERING,
 			OBS_COMBO_TYPE_LIST, OBS_COMBO_FORMAT_INT);
 	obs_property_list_add_int(p, TEXT_BUFFERING_AUTO,

obs-studio-0.8.2+git20150211.6099c65.tar.xz/plugins/win-wasapi/data/locale/zh-CN.ini Added

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/plugins/win-wasapi/enum-wasapi.hpp -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/plugins/win-wasapi/enum-wasapi.hpp Changed

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/plugins/win-wasapi/win-wasapi.cpp -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/plugins/win-wasapi/win-wasapi.cpp Changed

@@ -27,13 +27,13 @@
 	string                      device_id;
 	string                      device_name;
 	bool                        isInputDevice;
-	bool                        useDeviceTiming;
-	bool                        isDefaultDevice;
+	bool                        useDeviceTiming = false;
+	bool                        isDefaultDevice = false;
 
-	bool                        reconnecting;
+	bool                        reconnecting = false;
 	WinHandle                   reconnectThread;
 
-	bool                        active;
+	bool                        active = false;
 	WinHandle                   captureThread;
 
 	WinHandle                   stopSignal;
@@ -72,11 +72,7 @@
 
 WASAPISource::WASAPISource(obs_data_t *settings, obs_source_t *source_,
 		bool input)
-	: reconnecting    (false),
-	  active          (false),
-	  reconnectThread (nullptr),
-	  captureThread   (nullptr),
-	  source          (source_),
+	: source          (source_),
 	  isInputDevice   (input)
 {
 	UpdateSettings(settings);
@@ -299,7 +295,7 @@
 
 	if (!reconnectThread.Valid())
 		blog(LOG_WARNING, "[WASAPISource::Reconnect] "
-		                "Failed to intiialize reconnect thread: %d",
+		                "Failed to intiialize reconnect thread: %lu",
 		                 GetLastError());
 }
 
@@ -494,8 +490,7 @@
 				device.name.c_str(), device.id.c_str());
 	}
 
-	obs_property_t *prop;
-	prop = obs_properties_add_bool(props, OPT_USE_DEVICE_TIMING,
+	obs_properties_add_bool(props, OPT_USE_DEVICE_TIMING,
 			obs_module_text("UseDeviceTiming"));
 
 	return props;

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/test/test-input/CMakeLists.txt -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/test/test-input/CMakeLists.txt Changed

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz/test/win/test.cpp -> obs-studio-0.8.2+git20150211.6099c65.tar.xz/test/win/test.cpp Changed

Changes of Revision 7