using namespace std;
-namespace {
-
string search_for_file(const string &filename)
{
+ if (!filename.empty() && filename[0] == '/') {
+ // Absolute path.
+ return filename;
+ }
+
+ // See if we match ^[a-z]:/, which is probably a URL of some sort
+ // (FFmpeg understands various forms of these).
+ for (size_t i = 0; i < filename.size() - 1; ++i) {
+ if (filename[i] == ':' && filename[i + 1] == '/') {
+ return filename;
+ }
+ if (!isalpha(filename[i])) {
+ break;
+ }
+ }
+
// Look for the file in all theme_dirs until we find one;
// that will be the permanent resolution of this file, whether
// it is actually valid or not.
for (const string &error : errors) {
fprintf(stderr, "%s\n", error.c_str());
}
- fprintf(stderr, "Couldn't find %s in any directory in --theme-dirs, exiting.\n",
- filename.c_str());
- exit(1);
+ return "";
}
-} // namespace
+string search_for_file_or_die(const string &filename)
+{
+ string pathname = search_for_file(filename);
+ if (pathname.empty()) {
+ fprintf(stderr, "Couldn't find %s in any directory in --theme-dirs, exiting.\n",
+ filename.c_str());
+ exit(1);
+ }
+ return pathname;
+}
ImageInput::ImageInput(const string &filename)
: movit::FlatInput({movit::COLORSPACE_sRGB, movit::GAMMA_sRGB}, movit::FORMAT_RGBA_POSTMULTIPLIED_ALPHA,
- GL_UNSIGNED_BYTE, 1280, 720), // FIXME
+ GL_UNSIGNED_BYTE, 1280, 720), // Resolution will be overwritten.
filename(filename),
- pathname(search_for_file(filename)),
+ pathname(search_for_file_or_die(filename)),
current_image(load_image(filename, pathname))
{
if (current_image == nullptr) { // Could happen even though search_for_file() returned.
fprintf(stderr, "Couldn't load image, exiting.\n");
exit(1);
}
+ set_width(current_image->width);
+ set_height(current_image->height);
set_pixel_data(current_image->pixels.get());
}
return nullptr;
}
- // TODO: Scale down if needed!
uint8_t *pic_data[4] = {nullptr};
unique_ptr<uint8_t *, decltype(av_freep)*> pic_data_cleanup(
&pic_data[0], av_freep);
unique_ptr<uint8_t[]> image_data(new uint8_t[len]);
av_image_copy_to_buffer(image_data.get(), len, pic_data, linesizes, AV_PIX_FMT_RGBA, frame->width, frame->height, 1);
- shared_ptr<Image> image(new Image{move(image_data), last_modified});
+ shared_ptr<Image> image(new Image{unsigned(frame->width), unsigned(frame->height), move(image_data), last_modified});
return image;
}
timespec last_modified = first_modified;
struct stat buf;
for ( ;; ) {
- sleep(1);
+ {
+ unique_lock<mutex> lock(threads_should_quit_mu);
+ threads_should_quit_modified.wait_for(lock, chrono::seconds(1), []() { return threads_should_quit; });
+ }
if (threads_should_quit) {
return;
void ImageInput::shutdown_updaters()
{
- // TODO: Kick these out of the sleep before one second?
- threads_should_quit = true;
-
+ {
+ unique_lock<mutex> lock(threads_should_quit_mu);
+ threads_should_quit = true;
+ threads_should_quit_modified.notify_all();
+ }
for (auto &it : update_threads) {
it.second.join();
}
mutex ImageInput::all_images_lock;
map<string, shared_ptr<const ImageInput::Image>> ImageInput::all_images;
map<string, thread> ImageInput::update_threads;
-volatile bool ImageInput::threads_should_quit = false;
+mutex ImageInput::threads_should_quit_mu;
+bool ImageInput::threads_should_quit = false;
+condition_variable ImageInput::threads_should_quit_modified;