]>
git.sesse.net Git - casparcg/log
niklaspandersson [Tue, 20 Aug 2013 08:15:32 +0000 (10:15 +0200)]
* psd: support for extracting scaling-data of text-layer, and extracting sheet-color meta-data
niklaspandersson [Mon, 19 Aug 2013 08:17:30 +0000 (10:17 +0200)]
* new way of mapping font-name to font-file. Using postscript font-name instead of the mapping found i the registry.
* extracting unicode layer-name from psd-files.
niklaspandersson [Fri, 16 Aug 2013 14:34:16 +0000 (16:34 +0200)]
Merge branch '2.1.0' of https://github.com/CasparCG/Server into 2.1.0
Conflicts:
modules/psd/psd_scene_producer.cpp
* added support for solid colors in scene_producer factory
niklaspandersson [Fri, 16 Aug 2013 13:10:50 +0000 (15:10 +0200)]
* some refactoring i psd + support for rectangular vector-masks
niklaspandersson [Fri, 16 Aug 2013 13:10:08 +0000 (15:10 +0200)]
* support for clearing/overriding a channel lock
Helge Norberg [Fri, 16 Aug 2013 12:26:38 +0000 (14:26 +0200)]
Merge branch '2.1.0' of https://github.com/CasparCG/Server into 2.1.0
Helge Norberg [Fri, 16 Aug 2013 12:26:24 +0000 (14:26 +0200)]
Initial XML format for scenes and timeline support for PSD
niklaspandersson [Wed, 14 Aug 2013 10:56:23 +0000 (12:56 +0200)]
* AsyncEventServer: implemented send-queue and protected socket->async_write_some from concurrent calls
niklaspandersson [Wed, 14 Aug 2013 09:04:30 +0000 (11:04 +0200)]
* psd-importer: fixed support for new descriptor value-type
niklaspandersson [Wed, 14 Aug 2013 08:00:28 +0000 (10:00 +0200)]
Merge branch '2.1.0' of https://github.com/CasparCG/Server into 2.1.0
niklaspandersson [Wed, 14 Aug 2013 07:58:20 +0000 (09:58 +0200)]
* the psd-importer now extracts timeline-data
Helge Norberg [Tue, 13 Aug 2013 09:25:42 +0000 (11:25 +0200)]
Added basic timeline/keyframe support in scene_producer
Helge Norberg [Tue, 13 Aug 2013 09:24:58 +0000 (11:24 +0200)]
Additional font metrics and correct height calculation
niklaspandersson [Tue, 13 Aug 2013 07:48:52 +0000 (09:48 +0200)]
* made lifecycle_bound_objects_ thread-safe
niklaspandersson [Mon, 12 Aug 2013 16:16:57 +0000 (18:16 +0200)]
Merge branch '2.1.0' of https://github.com/CasparCG/Server into 2.1.0
Helge Norberg [Mon, 12 Aug 2013 16:14:21 +0000 (18:14 +0200)]
Added missing files
niklaspandersson [Mon, 12 Aug 2013 16:04:37 +0000 (18:04 +0200)]
Merge branch '2.1.0' of https://github.com/CasparCG/Server into 2.1.0
Conflicts:
protocol/amcp/AMCPProtocolStrategy.cpp
niklaspandersson [Mon, 12 Aug 2013 16:01:35 +0000 (18:01 +0200)]
* refactoring of AMCPProtocolStrategy::Parse and the AMCPCommands
* implemented LOCK-command to protect a channel from accidental access
Helge Norberg [Fri, 9 Aug 2013 15:56:55 +0000 (17:56 +0200)]
Added support for psd placeholder layer
Helge Norberg [Fri, 9 Aug 2013 13:02:36 +0000 (15:02 +0200)]
Allow for a scene_producer to expose parameters updateable via CALL
niklaspandersson [Thu, 8 Aug 2013 15:03:13 +0000 (17:03 +0200)]
* implemented lifecycle-bound functions in caspar::io::connection
* refactored caspar::io::connection to avoid circular references
* moved delimiter-chunking logic out from AMCPProtocolStrategy and CIIProtocolStrategy. They now depend on being wrapped by a delimiter_based_chunking_strategy
niklaspandersson [Thu, 8 Aug 2013 08:18:54 +0000 (10:18 +0200)]
* added factory-parameters for font, size and color to text-producer
niklaspandersson [Thu, 8 Aug 2013 07:36:00 +0000 (09:36 +0200)]
* renamed psd.h/cpp to psd_scene_producer.h/cpp
niklaspandersson [Thu, 8 Aug 2013 07:22:39 +0000 (09:22 +0200)]
* exposed function bool try_get_color(const std::wstring& str, uint32_t& value) from color_producer.h
niklaspandersson [Wed, 7 Aug 2013 14:42:00 +0000 (16:42 +0200)]
Merge branch '2.1.0' of https://github.com/CasparCG/Server into 2.1.0
niklaspandersson [Wed, 7 Aug 2013 14:35:51 +0000 (16:35 +0200)]
* fixed fontname-to-file mapping
niklaspandersson [Wed, 7 Aug 2013 12:28:27 +0000 (14:28 +0200)]
made all producers-factories able to handle non-uppercased params
niklaspandersson [Wed, 7 Aug 2013 12:28:27 +0000 (14:28 +0200)]
made all producers-factories able to handle non-uppercased params
niklaspandersson [Wed, 7 Aug 2013 10:45:47 +0000 (12:45 +0200)]
simplified the handling of parameters
niklaspandersson [Wed, 7 Aug 2013 08:25:14 +0000 (10:25 +0200)]
Merge branch '2.1.0' of https://github.com/CasparCG/Server into 2.1.0
niklaspandersson [Wed, 7 Aug 2013 08:25:04 +0000 (10:25 +0200)]
disabled GL_DEPTH_TEST to prevent z-fighting in text-producer
niklaspandersson [Wed, 7 Aug 2013 08:03:51 +0000 (10:03 +0200)]
* made it optional to normalize coordinates of a text-producer in order for it to work both standalone and in a scene
Helge Norberg [Wed, 7 Aug 2013 08:01:30 +0000 (10:01 +0200)]
Changed CALL params to vector of strings
niklaspandersson [Tue, 6 Aug 2013 12:51:35 +0000 (14:51 +0200)]
binding between linked layers in psd-import/scene-producer
niklaspandersson [Tue, 6 Aug 2013 07:20:24 +0000 (09:20 +0200)]
Merge branch '2.1.0' of https://github.com/CasparCG/Server into 2.1.0
niklaspandersson [Mon, 5 Aug 2013 06:33:14 +0000 (08:33 +0200)]
added freetype to dependencies
niklaspandersson [Mon, 5 Aug 2013 06:33:14 +0000 (08:33 +0200)]
added freetype to dependencies
niklaspandersson [Thu, 1 Aug 2013 08:03:20 +0000 (10:03 +0200)]
* added geometry to frames for custom rendering
* new text-producer using freetype
* new photoshop-parser for the scene-producer
niklaspandersson [Wed, 24 Jul 2013 09:33:56 +0000 (11:33 +0200)]
* added parsing of text-layer data
niklaspandersson [Wed, 24 Jul 2013 09:32:36 +0000 (11:32 +0200)]
preparing for allowing producers to supply own geometry:
* moved generation of texture coordinates for background-texture to vertex-shader
* using modelview-matrix for translations and scaling instead of manually multiplying coordinates
niklaspandersson [Thu, 11 Jul 2013 10:55:17 +0000 (12:55 +0200)]
Merge branch '2.1.0' of https://github.com/CasparCG/Server into 2.1.0
Conflicts:
modules/image/util/image_algorithms.cpp
niklaspandersson [Thu, 11 Jul 2013 10:52:57 +0000 (12:52 +0200)]
added a pdf-parser for the psd-import
cosmetic changes to psd-import module
Helge Norberg [Fri, 5 Jul 2013 13:45:53 +0000 (15:45 +0200)]
Support for ternary operator equivalent for bindings
niklaspandersson [Fri, 5 Jul 2013 07:15:00 +0000 (09:15 +0200)]
added missing files for psd
niklaspandersson [Fri, 5 Jul 2013 07:06:15 +0000 (09:06 +0200)]
added missing files for psd
Helge Norberg [Thu, 4 Jul 2013 18:03:21 +0000 (20:03 +0200)]
More binding functionality
niklaspandersson [Thu, 4 Jul 2013 14:13:11 +0000 (16:13 +0200)]
Merge branch '2.1.0' of https://github.com/CasparCG/Server into 2.1.0
niklaspandersson [Thu, 4 Jul 2013 14:12:19 +0000 (16:12 +0200)]
psd::producer_factory
Helge Norberg [Thu, 4 Jul 2013 12:17:36 +0000 (14:17 +0200)]
work in progress changes
Helge Norberg [Thu, 4 Jul 2013 11:57:12 +0000 (13:57 +0200)]
const_producer for psd producer
niklaspandersson [Thu, 4 Jul 2013 11:42:30 +0000 (13:42 +0200)]
psd project-filter file
niklaspandersson [Thu, 4 Jul 2013 10:50:27 +0000 (12:50 +0200)]
primal psd-file reading
Helge Norberg [Thu, 4 Jul 2013 09:11:00 +0000 (11:11 +0200)]
Draft of interaction with producers and scene_producer
Helge Norberg [Wed, 3 Jul 2013 15:09:25 +0000 (17:09 +0200)]
Draft of interaction with producers and scene_producer
Helge Norberg [Wed, 10 Apr 2013 09:33:28 +0000 (11:33 +0200)]
Helge Norberg [Wed, 10 Apr 2013 09:20:33 +0000 (11:20 +0200)]
Helge Norberg [Wed, 10 Apr 2013 09:15:29 +0000 (11:15 +0200)]
Helge Norberg [Wed, 10 Apr 2013 09:05:01 +0000 (11:05 +0200)]
Helge Norberg [Wed, 10 Apr 2013 08:33:09 +0000 (10:33 +0200)]
Helge Norberg [Wed, 10 Apr 2013 08:26:24 +0000 (10:26 +0200)]
Helge Norberg [Tue, 9 Apr 2013 16:26:54 +0000 (18:26 +0200)]
Helge Norberg [Tue, 9 Apr 2013 15:17:14 +0000 (17:17 +0200)]
Helge Norberg [Tue, 9 Apr 2013 09:09:45 +0000 (11:09 +0200)]
Helge Norberg [Tue, 9 Apr 2013 08:43:23 +0000 (10:43 +0200)]
Helge Norberg [Tue, 9 Apr 2013 08:42:24 +0000 (10:42 +0200)]
Helge Norberg [Tue, 9 Apr 2013 08:41:17 +0000 (10:41 +0200)]
Helge Norberg [Tue, 9 Apr 2013 08:29:18 +0000 (10:29 +0200)]
Helge Norberg [Tue, 9 Apr 2013 08:12:42 +0000 (10:12 +0200)]
Helge Norberg [Tue, 9 Apr 2013 08:10:44 +0000 (10:10 +0200)]
Helge Norberg [Tue, 9 Apr 2013 08:00:06 +0000 (10:00 +0200)]
Helge Norberg [Mon, 8 Apr 2013 15:56:14 +0000 (17:56 +0200)]
Helge Norberg [Mon, 8 Apr 2013 13:21:37 +0000 (15:21 +0200)]
Merge branch '2.1.0' of https://github.com/CasparCG/Server into 2.1.0
Helge Norberg [Mon, 8 Apr 2013 13:20:39 +0000 (15:20 +0200)]
Ignored additional files
HellGore [Mon, 8 Apr 2013 13:11:10 +0000 (06:11 -0700)]
Merge pull request #90 from CasparCG/2.1gitrev
gitrev.bat revision marking for server 2.1
TK3 [Thu, 28 Mar 2013 19:59:04 +0000 (15:59 -0400)]
gitrev.bat revision marking for server 2.1
TK3 [Sun, 24 Mar 2013 23:04:51 +0000 (19:04 -0400)]
Import of svn ignores. This needs to be cleaned at some point. Subversion had an ignore property for each directory. Git has one per repository.
This is a generic ignore file that I will commit to all current branches. I did my best to make sure all cases in the current branches are covered.
ronag [Sat, 16 Feb 2013 19:24:17 +0000 (19:24 +0000)]
flash_producer: Workaround for flickering with high cpu and cpu-accelerator. The actual bug needs to be found...
git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/branches/2.1.0@3756
362d55ac -95cf-4e76-9f9a-
cbaa9c17b72d
hellgore [Thu, 4 Oct 2012 09:45:00 +0000 (09:45 +0000)]
Updated changelog for 2.1
git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/branches/2.1.0@3385
362d55ac -95cf-4e76-9f9a-
cbaa9c17b72d
hellgore [Wed, 26 Sep 2012 15:10:55 +0000 (15:10 +0000)]
Merged new video mode support from trunk
git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/branches/2.1.0@3369
362d55ac -95cf-4e76-9f9a-
cbaa9c17b72d
hellgore [Wed, 26 Sep 2012 09:26:06 +0000 (09:26 +0000)]
git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/branches/2.1.0@3366
362d55ac -95cf-4e76-9f9a-
cbaa9c17b72d
hellgore [Tue, 25 Sep 2012 15:28:25 +0000 (15:28 +0000)]
Merged CLK changes from trunk, and separated delimiter message splitting and codepage conversion from AsyncEventServer to separate protocol adapters
git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/branches/2.1.0@3365
362d55ac -95cf-4e76-9f9a-
cbaa9c17b72d
hellgore [Tue, 11 Sep 2012 12:28:56 +0000 (12:28 +0000)]
git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/branches/2.1.0@3288
362d55ac -95cf-4e76-9f9a-
cbaa9c17b72d
hellgore [Mon, 10 Sep 2012 16:09:54 +0000 (16:09 +0000)]
marked oal_consumer changes as merged because the problem is already fixed in 2.1 but differently
git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/branches/2.1.0@3281
362d55ac -95cf-4e76-9f9a-
cbaa9c17b72d
hellgore [Mon, 10 Sep 2012 16:05:18 +0000 (16:05 +0000)]
Merged asynchronous invocation of consumers from 2.0
git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/branches/2.1.0@3280
362d55ac -95cf-4e76-9f9a-
cbaa9c17b72d
hellgore [Mon, 10 Sep 2012 15:20:41 +0000 (15:20 +0000)]
Refactored executor to be more like in 2.0 and broke out the priority queue-related functionality to a separate class.
git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/branches/2.1.0@3279
362d55ac -95cf-4e76-9f9a-
cbaa9c17b72d
hellgore [Fri, 7 Sep 2012 07:40:52 +0000 (07:40 +0000)]
Refactored executor to support try_begin_invoke which does not block until room is available in the executor queue, but returns immediately instead.
git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/branches/2.1.0@3262
362d55ac -95cf-4e76-9f9a-
cbaa9c17b72d
hellgore [Thu, 6 Sep 2012 14:43:49 +0000 (14:43 +0000)]
Refactored executor to support try_begin_invoke which does not block until room is available in the executor queue, but returns immediately instead.
git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/branches/2.1.0@3248
362d55ac -95cf-4e76-9f9a-
cbaa9c17b72d
hellgore [Thu, 6 Sep 2012 14:19:42 +0000 (14:19 +0000)]
set svn:eol-style native on .h and .cpp files
git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/branches/2.1.0@3247
362d55ac -95cf-4e76-9f9a-
cbaa9c17b72d
hellgore [Tue, 4 Sep 2012 14:53:57 +0000 (14:53 +0000)]
Merged sfw playing through template host instead of via ffmpeg
git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/branches/2.1.0@3231
362d55ac -95cf-4e76-9f9a-
cbaa9c17b72d
hellgore [Tue, 4 Sep 2012 14:11:46 +0000 (14:11 +0000)]
Merged latin1 fallback support to 2.1
git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/branches/2.1.0@3230
362d55ac -95cf-4e76-9f9a-
cbaa9c17b72d
hellgore [Tue, 4 Sep 2012 13:18:15 +0000 (13:18 +0000)]
Merged image_scroll_producer changes to 2.1
git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/branches/2.1.0@3229
362d55ac -95cf-4e76-9f9a-
cbaa9c17b72d
hellgore [Mon, 3 Sep 2012 13:25:10 +0000 (13:25 +0000)]
Merged screen consumer improvements from trunk
git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/branches/2.1.0@3228
362d55ac -95cf-4e76-9f9a-
cbaa9c17b72d
Zebiolo [Thu, 28 Jun 2012 11:53:16 +0000 (11:53 +0000)]
Changed linking path for OpenAL.
git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/branches/2.1.0@3133
362d55ac -95cf-4e76-9f9a-
cbaa9c17b72d
Zebiolo [Thu, 28 Jun 2012 11:52:34 +0000 (11:52 +0000)]
Added 64-bit OpenAL. Separate install is not necessary anymore.
git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/branches/2.1.0@3132
362d55ac -95cf-4e76-9f9a-
cbaa9c17b72d
Zebiolo [Thu, 28 Jun 2012 11:31:17 +0000 (11:31 +0000)]
Changed default config.
git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/branches/2.1.0@3130
362d55ac -95cf-4e76-9f9a-
cbaa9c17b72d
hellgore [Mon, 18 Jun 2012 12:41:17 +0000 (12:41 +0000)]
Added some documentation to tweener.h and to memory.h
git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/branches/2.1.0@3118
362d55ac -95cf-4e76-9f9a-
cbaa9c17b72d
hellgore [Thu, 14 Jun 2012 17:31:18 +0000 (17:31 +0000)]
Merged from trunk
git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/branches/2.1.0@3115
362d55ac -95cf-4e76-9f9a-
cbaa9c17b72d
ronag [Mon, 14 May 2012 08:00:59 +0000 (08:00 +0000)]
git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/branches/2.1.0@3016
362d55ac -95cf-4e76-9f9a-
cbaa9c17b72d
ronag [Tue, 8 May 2012 14:27:47 +0000 (14:27 +0000)]
git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/branches/2.1.0@2932
362d55ac -95cf-4e76-9f9a-
cbaa9c17b72d
Zebiolo [Fri, 27 Apr 2012 07:43:49 +0000 (07:43 +0000)]
Cosmetic changes and once again fixed CINF command.
git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/branches/2.1.0@2927
362d55ac -95cf-4e76-9f9a-
cbaa9c17b72d