]> git.sesse.net Git - casparcg/commit
Merged trunk:
authorronag <ronag@362d55ac-95cf-4e76-9f9a-cbaa9c17b72d>
Tue, 27 Dec 2011 13:21:02 +0000 (13:21 +0000)
committerronag <ronag@362d55ac-95cf-4e76-9f9a-cbaa9c17b72d>
Tue, 27 Dec 2011 13:21:02 +0000 (13:21 +0000)
commitf13c6c23fa359cb0462c847fa83aa7db2381d9e0
tree1d30e1043841cf3542d3762987b9c9ad94a479e5
parent29ace981d0432490f00f148823ae89f781d20424
Merged trunk:

r1951

---------------------
r1950
AMCP: Print executed command to debug.
---------------------
r1949
print_producer_proxy changes.
---------------------
r1948

---------------------
r1947
flash_producer: Proper uninit.
---------------------
r1946
flash_producer: Don't forget buffering.
---------------------
r1945
flash-producer: Don't reinitialize the thread, only the ax-control.
---------------------
r1944
Missing executor changes.
---------------------
r1943
AMCP: Reply with error on amcp command overflow.
---------------------
r1942
AMCP: - Limit command queue size. - Let CLEAR clear the command queue.
---------------------
r1941

---------------------
r1940
Removed unnecessary printing.
---------------------
r1939
Print entire message, not parts.
---------------------

git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/branches/2.1.0@1954 362d55ac-95cf-4e76-9f9a-cbaa9c17b72d
22 files changed:
common/concurrency/executor.h
core/producer/channel/channel_producer.cpp
core/producer/color/color_producer.cpp
core/producer/frame_producer.cpp
core/producer/frame_producer.h
core/producer/separated/separated_producer.cpp
core/producer/transition/transition_producer.cpp
modules/decklink/consumer/decklink_consumer.cpp
modules/decklink/producer/decklink_producer.cpp
modules/flash/producer/flash_producer.cpp
modules/image/producer/image_producer.cpp
modules/image/producer/image_scroll_producer.cpp
protocol/amcp/AMCPCommand.h
protocol/amcp/AMCPCommandQueue.cpp
protocol/amcp/AMCPCommandsImpl.cpp
protocol/amcp/AMCPCommandsImpl.h
protocol/amcp/AMCPProtocolStrategy.cpp
protocol/cii/CIIProtocolStrategy.cpp
protocol/cii/CIIProtocolStrategy.h
protocol/util/AsyncEventServer.cpp
protocol/util/ClientInfo.h
protocol/util/SocketInfo.h