Skip to content

Commit 4de6d18

Browse files
authored
feat: port 2.1 image scroll producer (#1372)
* feat: port 2.1 image scroll producer * fixup * Update src/modules/image/producer/image_scroll_producer.cpp * WIP
1 parent bf510d4 commit 4de6d18

File tree

6 files changed

+540
-18
lines changed

6 files changed

+540
-18
lines changed

src/modules/CMakeLists.txt

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
1-
cmake_minimum_required(VERSION 2.6)
2-
project("modules")
3-
4-
add_subdirectory(ffmpeg)
5-
add_subdirectory(oal)
6-
add_subdirectory(decklink)
7-
add_subdirectory(screen)
8-
add_subdirectory(newtek)
9-
if (ENABLE_HTML)
10-
add_subdirectory(html)
11-
endif ()
12-
13-
if (MSVC)
14-
add_subdirectory(flash)
15-
add_subdirectory(bluefish)
16-
endif()
17-
18-
add_subdirectory(image)
1+
cmake_minimum_required(VERSION 2.6)
2+
project("modules")
3+
4+
add_subdirectory(image)
5+
add_subdirectory(ffmpeg)
6+
add_subdirectory(oal)
7+
add_subdirectory(decklink)
8+
add_subdirectory(screen)
9+
add_subdirectory(newtek)
10+
if (ENABLE_HTML)
11+
add_subdirectory(html)
12+
endif ()
13+
14+
if (MSVC)
15+
add_subdirectory(flash)
16+
add_subdirectory(bluefish)
17+
endif()
18+

src/modules/image/CMakeLists.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ set(SOURCES
66

77
producer/image_producer.cpp
88

9+
producer/image_scroll_producer.cpp
10+
911
util/image_algorithms.cpp
1012
util/image_loader.cpp
1113

@@ -16,6 +18,8 @@ set(HEADERS
1618

1719
producer/image_producer.h
1820

21+
producer/image_scroll_producer.h
22+
1923
util/image_algorithms.h
2024
util/image_loader.h
2125
util/image_view.h

src/modules/image/image.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626

2727
#include "consumer/image_consumer.h"
2828
#include "producer/image_producer.h"
29+
#include "producer/image_scroll_producer.h"
2930

3031
#include <core/consumer/frame_consumer.h>
3132
#include <core/producer/frame_producer.h>
@@ -42,6 +43,7 @@ std::wstring version() { return u16(FreeImage_GetVersion()); }
4243
void init(core::module_dependencies dependencies)
4344
{
4445
FreeImage_Initialise();
46+
dependencies.producer_registry->register_producer_factory(L"Image Scroll Producer", create_scroll_producer);
4547
dependencies.producer_registry->register_producer_factory(L"Image Producer", create_producer);
4648
dependencies.consumer_registry->register_consumer_factory(L"Image Consumer", create_consumer);
4749
}

src/modules/image/producer/image_producer.cpp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -136,6 +136,10 @@ class ieq
136136
spl::shared_ptr<core::frame_producer> create_producer(const core::frame_producer_dependencies& dependencies,
137137
const std::vector<std::wstring>& params)
138138
{
139+
if (boost::contains(params.at(0), L"://")) {
140+
return core::frame_producer::empty();
141+
}
142+
139143
auto length = get_param(L"LENGTH", params, std::numeric_limits<uint32_t>::max());
140144

141145
// if (boost::iequals(params.at(0), L"[IMG_SEQUENCE]"))

0 commit comments

Comments
 (0)