Commit Graph

1468 Commits (0fca88dde970c671024c5412a52151a5c166fd81)

Author SHA1 Message Date
jp9000 0fca88dde9 Do not draw text from file if file not found 2014-08-24 08:31:03 -07:00
jp9000 97543def13 Fix 'possible loss of data' warning
Qt doesn't like to use size_t anywhere.
2014-08-24 08:27:27 -07:00
jp9000 12cdced337 Disable OSX app nap
This will hopefully help deal with a particular issue where the program
may go to sleep if it hasn't received input from the user for long
periods, or if a game is running in fullscreen mode apparently.
2014-08-24 08:10:51 -07:00
fryshorts 774731fbaf Use fontconfig for linux/mac
This uses fontconfig for looking up font files for freetype to use on
both linux and mac.  It's apparently a bit more optimal and prevents us
from having to worry about the load time on the mac version as well.

Refactored and moved all the old code to the find-font-windows.c file,
as it's no longer used on anything but windows.
2014-08-23 18:25:00 -07:00
jp9000 428c89ad4a Remove unused variable 2014-08-23 18:20:23 -07:00
Palana 448c3670a0 Refactor log upload to create JSON via obs_data 2014-08-24 02:05:46 +02:00
Palana b0e119a475 Remove unused variable 2014-08-23 01:27:22 +02:00
jp9000 db3614b585 Always create new object when setting a sub-object
Do not use the object returned from obs_data_get_obj to set new
settings.  It could be the default object, which means you'd just end up
modifying the default data, which won't get saved.  Always create a new
object when setting sub-object data.  It doesn't particularly hurt
anything.
2014-08-22 15:48:19 -07:00
jp9000 1bbdcc10d7 Fix obs_data_item_setdata
It would try to move data from the old pointer even if the pointer was
changed via realloc, which would cause it to copy data from freed
memory.  Instead, just get the position of the data and call memmove to
move it up.
2014-08-22 15:39:29 -07:00
jp9000 fe13f59e3d obs_data: Fix wrong data queried for release
On release of obs_data, if the default/autoselect values pointed toward
a sub-object or a sub-array, it would look up the data for the regular
user value.  (Palana must have forgot to change these functions around
when adding the default/autoselect functionality)
2014-08-22 15:34:25 -07:00
Palana ca8aba0bf4 Add Help -> "Show Log Files" menu entry 2014-08-22 19:10:44 +02:00
Palana a64707a4f5 Add File -> "Show Recordings" menu entry 2014-08-22 19:10:44 +02:00
jp9000 066d08ae46 Add bug tracker to README and CONTRIBUTING files 2014-08-22 05:12:01 -07:00
Jim 83853a3e34 Merge pull request #254 from BtbN/cmake-fix
CMake fixes for iconv and Freetype finding
2014-08-21 08:57:19 -07:00
BtbN 5101ca84f6 Fix HINTS/PATHS in Findv4l2 module 2014-08-21 17:37:16 +02:00
BtbN 2bf8a7dce9 Include FindPackageHandleStandardArgs.cmake in every find module using it
It just worked so far because FindCXX11 happend to include it
already, and it also happend to be the first FindModule used.
2014-08-21 16:38:49 +02:00
BtbN 5ec0d2ded4 Fix FindFreetype naming and find logic
Freetype is quite complicated, copied most of the logic from the
original FindFreetype module.
2014-08-21 16:36:21 +02:00
BtbN 997b4f9161 Fix FindIconv naming consistency 2014-08-21 15:28:44 +02:00
Jim ffe74f5903 Merge pull request #252 from palana/mac-window-capture
Add window capture options for OSX
2014-08-21 05:52:51 -07:00
jp9000 4654eca6b8 Remove GL shader debug text 2014-08-21 03:04:20 -07:00
jp9000 cf1b106a26 Fix null pointer dereference
When looking up translated font names within font files, it was not
checking for null on the 'charset' variable (the translation character
set wasn't added/availble).
2014-08-20 16:46:50 -07:00
Jim 911c885b3b Merge pull request #253 from drekryan/patch-1
Remove Justin.tv references/service
2014-08-20 16:13:07 -07:00
Derrick Lambert 1b4d8221dd Remove Justin.tv references/service 2014-08-20 18:41:18 -04:00
jp9000 b54ab482b5 Fix freetype cmake module
On fedora, the freetype cmake module would not find the correct
location.  This is because it wasn't using the pkg-cofig include
directory, which is different from the main ft2build.h header directory
(which is /usr/include).

This modification may be a good thing to do on all the cmake packages,
actually.  Currently, they all just search for the location of a
specific header, and ignore the pkg-config includes if they find it in
specific hint locations.
2014-08-20 15:17:12 -07:00
jp9000 5291760cf8 Fix gs_matrix_* issues
Multiplication of the matricies was being done in the wrong direction.
This caused source transformations to come out looking incorrect, for
example the linux-xshm source's cursor would not be drawn correctly or
in the right position if the source was moved/scaled/rotated.  The
problem just turned out to be that the gs_matrix_* functions were
multiplying in the wrong direction.  Reverse the direction of
multiplication, and the problem is solved.
2014-08-20 13:04:13 -07:00
jp9000 8d1d1ddd14 Add reverse matrix multiply functions
The *_i functions multiply the value by the matrix instead of the other
way around, then store the result.
2014-08-20 12:34:44 -07:00
Palana f8ed37dec4 Add Window Capture to mac-capture plugin 2014-08-20 00:50:18 +02:00
Palana 7b6c4a130a Add Display Capture crop modes 2014-08-20 00:50:17 +02:00
Palana bc64fa97a0 Add CoreGraphics window utilities 2014-08-20 00:42:56 +02:00
Jim cf00fc1986 Merge pull request #249 from BtbN/cmake-fix
Fix double invocation of install_obs_plugin in every single plugin
2014-08-19 05:33:01 -07:00
BtbN 02725acdd4 Fix double invocation of install_obs_plugin in every single plugin 2014-08-19 14:24:59 +02:00
Jim 7eee45fb7f Merge pull request #248 from benklett/cmake-fixes
Fix the cmake code for text-freetype2
2014-08-19 05:01:42 -07:00
benklett f2723aa11e Fix the cmake code for text-freetype2
it is now possible to build text-freetype2 on linux if you comment out a return() otherwise there would have been an error
Also i made the word iconv in find_package lower case, to match the APPLE cmake code
2014-08-19 13:57:22 +02:00
Jim a0897b0adf Merge pull request #243 from jp9000/font-test-mac
Merge freetype text plugin
2014-08-19 03:01:10 -07:00
jp9000 7f0ae838d7 Add system font lookup for mac/windows
This changes the font plugin from using a font file to using a specific
installed system font, which is searched for on each specific system and
associated with the font file.  It now uses a font property instead of a
path property, and font size has been removed because the font property
now handles that.

When the module is first loaded, it will build up a list of system fonts
in order to be usable by Freetype.  It was quite painful to program this
because font files can contain multiple localized versions of their face
names, and then there was the issue where windows likes to mangle
custom style types to the font name.  Regardless, it all seems to have
worked out pretty well.

Minor issues:
- Truetype/Opentype fonts sometimes do not automatically have
  italic and/or bold styles available, it seems that the system applies
  transformations manually in those cases.  We don't do this yet,
  however, so right now a user might select a font with italic/bold
  only to discover that italic/bold doesn't always work.  Not entirely
  sure what to do about this yet.  There's probably a freetype function
  to do something like that somehow,

This also requires that iconv be used for non-windows systems to be able
to look up localized font names within font files.  Windows will use
the win32 API and code page IDs to translate font names.
2014-08-19 02:11:37 -07:00
Jim b03036734a Merge pull request #247 from fryshorts/xshm-input
Fix cursor position in xshm plugin
2014-08-18 13:09:30 -07:00
fryshorts 8f206def32 Fix cursor position in xshm plugin
By premultiplying the cursor translation the cursor is positioned
relative, and thus correctly, when the source has transformations
applied to it.
2014-08-18 20:19:26 +02:00
Jim 6e9b70b046 Merge pull request #240 from jkoan/master
Fix Remove Dialog
2014-08-18 00:23:00 -07:00
jp9000 1a5eca34db Add font property to properties widget
Displays the full name of the font in the font's designated settings,
with a "Select Font" button which brings up a font chooser dialog.
2014-08-18 00:14:02 -07:00
jp9000 0bf9736ddd Add font property
Adds the following function:
------------------------------
obs_properties_add_font

This function creates a 'font' property to allow selection of a system
font.  Implementation by the UI should treat the setting as an obs_data
sub-object with four sub-items:
 - face:   face name (string)
 - style:  style name (string)
 - size:   size (integer)
 - flags:  font flags (integer)

'flags' can be any combination of the following values:
 - OBS_FONT_BOLD
 - OBS_FONT_ITALIC
 - OBS_FONT_UNDERLINE
 - OBS_FONT_STRIKEOUT
2014-08-18 00:14:02 -07:00
paibox e1611b431c Merge Freetype text plugin 2014-08-18 00:14:02 -07:00
Jkoan cc5884c136 Fix Remove Dialog
Remove failed test and add other Messagebox to correct Text with Language support

Add Title again -,-
2014-08-17 14:40:03 +02:00
Jim 83fe23e168 Merge pull request #242 from Gol-D-Ace/master
Update crowdin url for translator instructions
2014-08-16 01:00:20 -07:00
Gol-D-Ace 9078ee72df Update crowdin url for translator instructions
crowdin moved from .net to .com
2014-08-16 06:52:18 +02:00
Jim 4d02563d2f Merge pull request #235 from Socapex/master
Alert user when using existing source name.
2014-08-15 15:09:05 -07:00
Jim 69b9e722b8 Merge pull request #234 from fryshorts/v4l2-input
Make input selectable in v4l2 plugin.
2014-08-14 00:24:48 -07:00
Socapex 6597206d93 Alert user when using existing source name. 2014-08-12 17:07:59 -04:00
jp9000 38d2cf591d Use the correct logging name for FLV outputs 2014-08-12 01:08:23 -07:00
jp9000 6680d3230a Improve FLV output logging
Log when the FLV file output has started and when it has finished.
2014-08-12 01:00:12 -07:00
jp9000 a8d4774eef Fix D3D11 render target blending issues
The alpha source and destination blend values were always being set to
one and zero, when they should have been set to the same as the color
values.  This caused the alpha of the source texture to always overwrite
the alpha of the destination texture, rather than apply the blend
function upon it.  Needless to say that it seriously screwed up the
render target if you rendered something with alpha on it.

Thanks to paibox for pointing this issue out and yelling at me to fix
it.  I apologize for not getting to this sooner.
2014-08-11 17:40:35 -07:00