Skip to content

fix compile issue caused by boost signals binding #23

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
pkeroulas wants to merge 2 commits into
base: develop
Choose a base branch
from
Open

fix compile issue caused by boost signals binding #23

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1756af1
fix compile issue caused by boost signals binding
pkeroulas Dec 2, 2019
a81de17
update glutter-gst-dev to version 3.0
pkeroulas Jun 17, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions configure.ac
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,8 +70,7 @@ AC_SUBST([CLUTTER_CFLAGS])
# libjson-glib-dev and others

# Clutter-GST
PKG_CHECK_MODULES([CLUTTERGST], [clutter-gst-2.0 >= 2.0], have_clutter_gst=true,
PKG_CHECK_MODULES([CLUTTERGST], [clutter-gst-1.0 >= 1.0], have_clutter_gst=true, have_clutter_gst=false))
PKG_CHECK_MODULES([CLUTTERGST], [clutter-gst-3.0 >= 3.0], have_clutter_gst=true, have_clutter_gst=false)
if test "x${have_clutter_gst}" = "xfalse" ; then
AC_MSG_ERROR([missing package: libclutter-gst-dev])
fi
Expand Down
4 changes: 2 additions & 2 deletions src/brcosaeffect.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,14 +79,14 @@ void BrCoSaEffect::setup_actor(ClutterActor *actor)
clutter_actor_set_shader(actor, shader_);
}

void BrCoSaEffect::on_contrast_changed(std::string &name, float value)
void BrCoSaEffect::on_contrast_changed(std::string name, float value)
{
UNUSED(name);
contrast_ = value;
update_all_actors();
}

void BrCoSaEffect::on_saturation_changed(std::string &name, float value)
void BrCoSaEffect::on_saturation_changed(std::string name, float value)
{
UNUSED(name);
saturation_ = value;
Expand Down
4 changes: 2 additions & 2 deletions src/brcosaeffect.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@ class BrCoSaEffect: public Effect
virtual void init_properties();
virtual void update_actor(ClutterActor *actor);
virtual void setup_actor(ClutterActor *actor);
void on_saturation_changed(std::string &name, float value);
void on_contrast_changed(std::string &name, float value);
void on_saturation_changed(std::string name, float value);
void on_contrast_changed(std::string name, float value);
float contrast_;
float saturation_;
ClutterShader *shader_;
Expand Down
16 changes: 8 additions & 8 deletions src/gui.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ gboolean Gui::on_mouse_button_event(ClutterActor* /* actor */, ClutterEvent *eve
/**
* [0,255]
*/
void Gui::on_livefeed_opacity_changed(std::string &name, int value)
void Gui::on_livefeed_opacity_changed(std::string name, int value)
{
UNUSED(name);
if (owner_->get_configuration()->get_verbose())
Expand Down Expand Up @@ -414,7 +414,7 @@ gboolean Gui::key_press_event(ClutterActor *stage, ClutterEvent *event, gpointer
return TRUE;
}

void Gui::on_crossfade_ratio_changed(std::string &name, float value)
void Gui::on_crossfade_ratio_changed(std::string name, float value)
{
UNUSED(name);
if (crossfade_ratio_ != value)
Expand Down Expand Up @@ -904,7 +904,7 @@ void on_playback_texture_size_changed(ClutterTexture *texture,
gui->resize_actors();
}

void Gui::on_blending_mode_int_property_changed(std::string &name, int value)
void Gui::on_blending_mode_int_property_changed(std::string name, int value)
{
UNUSED(name);
if (value == 1)
Expand All @@ -913,7 +913,7 @@ void Gui::on_blending_mode_int_property_changed(std::string &name, int value)
set_blending_mode(BLENDING_MODE_NORMAL);
}

void Gui::on_playback_opacity_changed(std::string &name, int value)
void Gui::on_playback_opacity_changed(std::string name, int value)
{
UNUSED(name);
clutter_actor_set_opacity(playback_group_, value);
Expand Down Expand Up @@ -1168,15 +1168,15 @@ void Gui::show()
}
}

void Gui::on_black_out_opacity_changed(std::string &name, int value)
void Gui::on_black_out_opacity_changed(std::string name, int value)
{
if (owner_->get_configuration()->get_verbose())
g_print("make black_out opacity %d\n", value);
UNUSED(name);
clutter_actor_set_opacity(black_out_rectangle_, value);
}

void Gui::on_black_out_changed(std::string &name, int value)
void Gui::on_black_out_changed(std::string name, int value)
{
if (owner_->get_configuration()->get_verbose())
g_print("toggle black_out %d\n", value);
Expand Down Expand Up @@ -1326,7 +1326,7 @@ std::string Gui::get_blending_mode_name(BlendingMode mode)
}
}

void Gui::on_save_clip(unsigned int clip_number, std::string &file_name)
void Gui::on_save_clip(unsigned int clip_number, std::string file_name)
{
std::ostringstream os;
os << "Saving clip " << clip_number << " as " << file_name;
Expand All @@ -1335,7 +1335,7 @@ void Gui::on_save_clip(unsigned int clip_number, std::string &file_name)
animate_progress_bar();
}

void Gui::on_save_project(std::string &file_name)
void Gui::on_save_project(std::string file_name)
{
std::ostringstream os;
os << "Saving project as " << file_name;
Expand Down
16 changes: 8 additions & 8 deletions src/gui.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,14 +77,14 @@ class Gui
static void on_fullscreen(ClutterStage *stage, gpointer user_data);
static void on_unfullscreen(ClutterStage *stage, gpointer user_data);
static void on_render_frame(ClutterTimeline * timeline, gint msecs, gpointer user_data);
void on_blending_mode_int_property_changed(std::string &name, int value);
void on_crossfade_ratio_changed(std::string &name, float value);
void on_livefeed_opacity_changed(std::string &name, int value);
void on_black_out_changed(std::string &name, int value);
void on_black_out_opacity_changed(std::string &name, int value);
void on_playback_opacity_changed(std::string &name, int value);
void on_save_clip(unsigned int clip_number, std::string &file_name);
void on_save_project(std::string &file_name);
void on_blending_mode_int_property_changed(std::string name, int value);
void on_crossfade_ratio_changed(std::string name, float value);
void on_livefeed_opacity_changed(std::string name, int value);
void on_black_out_changed(std::string name, int value);
void on_black_out_opacity_changed(std::string name, int value);
void on_playback_opacity_changed(std::string name, int value);
void on_save_clip(unsigned int clip_number, std::string file_name);
void on_save_project(std::string file_name);
void enable_onionskin(bool value);
void set_onionskin_opacity(int value);
void hideCursor();
Expand Down
4 changes: 2 additions & 2 deletions src/pipeline.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -461,8 +461,8 @@ Pipeline::Pipeline(Application* owner) :
GstElement* queue0 = gst_element_factory_make("queue", "queue0");
g_assert(queue0);

videosink_ = gst_element_factory_make ("cluttersink", NULL);
g_object_set (videosink_, "texture", CLUTTER_TEXTURE(owner_->get_gui()->get_live_input_texture()), NULL);
videosink_ = gst_element_factory_make ("clutterautovideosink", NULL);
g_object_set (videosink_, "content", clutter_actor_get_content(owner_->get_gui()->get_live_input_texture()), NULL);

// TODO: Make sure the rendering FPS is constant, and not subordinate to
// the FPS of the camera.
Expand Down
8 changes: 4 additions & 4 deletions tests/check_properties.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,22 +4,22 @@
#include <map>
#include <iostream>

void int_cb(std::string &name, int value)
void int_cb(std::string name, int value)
{
std::cout << name << " changed to " << value << std::endl;
}

void float_cb(std::string &name, float value)
void float_cb(std::string name, float value)
{
std::cout << name << " changed to " << value << std::endl;
}

void string_cb(std::string &name, std::string value)
void string_cb(std::string name, std::string value)
{
std::cout << name << " changed to " << value << std::endl;
}

void bool_cb(std::string &name, bool value)
void bool_cb(std::string name, bool value)
{
std::cout << name << " changed to " << value << std::endl;
}
Expand Down