1404 Commits

Author SHA1 Message Date
jp9000
f2d2b58ae2 Add support for 32/64bit environment variables
This can make it a bit easier to set up 32bit/64bit environments
separately on windows.  This simply allows you to additionally set
FFmpegPath32, FFmpegPath64, x264Path32, x264Path64, etc.
2014-07-18 22:41:23 -07:00
jp9000
85701b0925 Allow copying of all dependencies (windows only)
If the cmake user variable COPY_DEPENDENCIES is set, this script will
make it so that a windows build will automatically copy all required
dependencies (FFmpeg, x264, and Qt5) to the respective
additional_install_files\exec(32|64) directory.  This makes it much
easier to set up a development environment on windows, and much easier
to make usable test builds.

It will also copy the appropriate Direct3D compiler DLL, along with
dependencies of dependencies (the icu*.dll and EGL/GLES files for Qt)
2014-07-18 22:41:22 -07:00
jp9000
5c597102f2 Improve additional_install_files for debug/release
This improves dependency copying and adds separated debug/release
install files.
2014-07-18 22:41:11 -07:00
jp9000
fbf4d18399 Remove obsolete FindDirectX.cmake script
There's no need to find DirectX because with VS2013 and mingw it's
already available by default.  Older visual studio versions that didn't
come with DirectX by default are no longer supported anyway.

(Also mingw doesn't currently work at all due to lack of proper headers,
but once they do it'll be available in the same way.  I think.)
2014-07-19 01:38:43 +02:00
BtbN
1525877bcc Update INSTALL instructions for Linux 2014-07-19 01:38:42 +02:00
BtbN
415a698bac Add support for build time dependency copying 2014-07-19 01:38:42 +02:00
BtbN
4b5b7534aa Copy and install PDB files on msvc builds 2014-07-19 01:38:41 +02:00
BtbN
38c2fc87aa Move all data into the subdir it belongs to
Completely removes the build dir in favor of cmake based build layouting
2014-07-19 01:38:41 +02:00
BtbN
2515aeb320 Remove Visual Studio projects 2014-07-19 01:38:39 +02:00
Jim
cffd8c42b5 Merge pull request #189 from BtbN/cmake_jansson_fix
Fix Jansson dependency importing
2014-07-18 15:16:47 -07:00
BtbN
973435cb52 Move config include path, so it works for the exported target 2014-07-17 21:32:31 +02:00
BtbN
3b26db389d Fix Jansson dependency importing 2014-07-17 18:13:25 +02:00
jp9000
5da8d14570 Fix update checck bug
Fix bug where updates for windows would check for mac updates and vise
versa.

(I am ashamed)
2014-07-17 07:03:27 -07:00
jp9000
a5a7ba4650 Update to 0.4.1 2014-07-17 06:25:37 -07:00
jp9000
18026c363d No need to initialize map value to 0 (bug fix)
There's no need to initialize the map value to 0.  What was happening is
that obs_scene_add was adding a ref to a non-existent value, which
simply created it and added 1, which is perfectly fine.  Then,
obs_add_source would set the ref to 0, overwriting the existing value.

So this meant that if you didn't call them in the right order, it
wouldn't work properly, and would break, which was pretty stupid.

Turns out that if you access a map value that doesn't exist, it'll
create one with the default constructor of that type.  In this case, int
will initialize to 0, which was exactly what we wanted in the first
place, and defeats the purpose of even needing to initialize the value
to 0.  So, there's no need to manually set it to 0 in
OBSBasic::SourceAdded, or worry about the order in which the functions
are called.

Just goes to show you have to be careful with reference counting.
2014-07-16 15:26:14 -07:00
jp9000
a01b59fb21 Reset blend state for image source
This is more of a temporary fix for the time being, it needs to handle
blend state changes better, perhaps via push/pop of state changes
2014-07-16 14:53:21 -07:00
fryshorts
87a527701a Use default color space in v4l2 plugin 2014-07-16 23:42:55 +02:00
fryshorts
ba3c093156 Add fallback sizes and framerates to v4l2 plugin.
Until a proper fix is found to support devices that use stepwise
or continuous values for framesize and framerate this adds fixed
values that can be selected.
For devices that support discrete values those are still queried
and used.
2014-07-16 23:42:55 +02:00
fryshorts
27297e7009 Add more logging to v4l2 plugin.
This adds some mostly user focused logging statements.
2014-07-16 23:42:55 +02:00
fryshorts
720f159274 Use macro for prefixing log messages in v4l2 plugin 2014-07-16 23:42:55 +02:00
fryshorts
d8f3761cad Fix a possibly left open file descriptor in v4l2 plugin 2014-07-16 23:42:55 +02:00
fryshorts
d03c94a000 Some minor code refactoring in v4l2 plugin
Small code changes to decrease indentation a little.
2014-07-16 23:42:55 +02:00
Palana
bd2b4c91b6 libobs/media-io: Handle VIDEO_CS_DEFAULT in video_format_get_parameters 2014-07-16 22:39:00 +02:00
Palana
2920281e69 mac-avcapture: Remove debug code 2014-07-16 22:39:00 +02:00
Anry
07ac02e62b Localization correction for image plugin
Closes #181
2014-07-16 02:38:11 +02:00
Palana
1759d28ee2 Fix scene editing for device pixel ratios ≠ 1
Fixes #177
2014-07-16 02:29:13 +02:00
jp9000
fa70b40587 Rename cpack description summary (also fix typo) 2014-07-15 17:00:03 -07:00
jp9000
a32139709f Fix cmake app package issue
Currently the Info.plist file names the app package as OBS.app and cmake
is trying to use 'OBS Studio.app'.  I renamed it to OBS for the time
being just because we don't currently have actual studio interface yet.
2014-07-15 16:38:25 -07:00
fryshorts
14e1549f7a Add system information for linux
This adds support for printing system information on linux.
2014-07-15 20:02:09 +02:00
fryshorts
0fa123dc47 Small coding style fixes 2014-07-15 20:01:39 +02:00
jp9000
a3293c4cd6 Update libdshowcapture to the latest version 2014-07-15 08:20:47 -07:00
jp9000
9cc1b43820 Change mac package name to just 'OBS' 2014-07-14 11:46:57 -07:00
Jim
defceeef5d Merge pull request #169 from hwdro/master
Simple volume meter widget
2014-07-14 11:14:47 -07:00
HomeWorld
6b284d9e58 Fix audio meters so that volume is applied linearly. 2014-07-14 21:12:53 +03:00
Jim
5425f1e165 Merge pull request #172 from dodgepong/latest-crowdin-translations
Latest translations from CrowdIn
2014-07-14 10:13:37 -07:00
dodgepong
ea5fbe01ca Latest translations from CrowdIn 2014-07-14 10:01:44 -07:00
jp9000
4c539a427d Use OBS_CONFIG as version string for the FLV mux 2014-07-14 09:52:36 -07:00
jp9000
633799f1c3 Use OBS_CONFIG as the actual version string
I didn't understand how tags worked so I was trying to filter it out
when I should really be using it for the actual version string.
2014-07-14 09:51:21 -07:00
HomeWorld
37828ce26d Implemented a simple volume meter widget 2014-07-14 19:32:39 +03:00
HomeWorld
336c3821fc Corrected a math mistake in obs_source.c calc_volume_levels. 2014-07-14 19:24:04 +03:00
jp9000
b7e0c9fb22 Parse obs-config.h version string to just the hash 2014-07-14 09:07:15 -07:00
jp9000
eee2ac038f Set User-Agent value of update check to OBS ver. 2014-07-14 08:51:57 -07:00
jp9000
e03f34de9f Don't use separate update files per OS
Instead, just use separate version and download entries.
2014-07-14 03:48:30 -07:00
jp9000
4e7f076c68 Add basic update checking 2014-07-14 03:19:24 -07:00
jp9000
f801348a33 Add MAKE_SEMANTIC_VERSION macro 2014-07-13 23:55:46 -07:00
jp9000
a98dfe507f Remove duplicate text entry 2014-07-13 22:33:57 -07:00
Jim
5136778288 Merge pull request #168 from dodgepong/latest-crowdin-translations
Latest translations from CrowdIn
2014-07-13 22:31:24 -07:00
dodgepong
682639e6ec Latest translations from CrowdIn 2014-07-13 22:19:24 -07:00
jp9000
b92b2e1031 Add text for missing window titles 2014-07-13 13:10:35 -07:00
Jim
c8cd3ab2ef Merge pull request #165 from BtbN/tags
Also use lightweight tags for git describe
2014-07-13 13:04:12 -07:00