mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-01-03 05:59:10 +00:00
Code Issues 1 Projects Releases Wiki Activity

camerabin-tests: fix lookup of UI files

Browse source 
These are uninstalled examples. Pass $srcdir to cpp to build the correct
location for the UI file.
This commit is contained in:
Stefan Kost 2011-01-12 17:13:07 +02:00
parent 2b4c854146
commit 4915493932
4 changed files with 7 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
tests/examples/camerabin/Makefile.am
View file

@ -21,7 +21,7 @@ gst_camera_LDADD = \
noinst_DATA = $(GST_CAMERABIN_UI_FILES) noinst_DATA = $(GST_CAMERABIN_UI_FILES)
INCLUDES = -DCAMERA_APPS_UIDIR=\""$(uidir)"\" INCLUDES = -DCAMERA_APPS_UIDIR=\""$(srcdir)"\"
else else
GST_CAMERABIN_GTK_EXAMPLES = GST_CAMERABIN_GTK_EXAMPLES =
@ -29,7 +29,7 @@ endif
gst_camera_perf_SOURCES = gst-camera-perf.c gst_camera_perf_SOURCES = gst-camera-perf.c
gst_camera_perf_CFLAGS = $(GST_CFLAGS) gst_camera_perf_CFLAGS = $(GST_CFLAGS)
gst_camera_perf_LDADD = $(GST_LIBS) gst_camera_perf_LDADD = $(GST_LIBS)
if HAVE_X11 if HAVE_X11

12
tests/examples/camerabin/gst-camera.c
View file

@ -65,8 +65,7 @@ gtk_widget_get_allocation (GtkWidget * w, GtkAllocation * a)
#define PREVIEW_TIME_MS (2 * 1000) #define PREVIEW_TIME_MS (2 * 1000)
#define N_BURST_IMAGES 10 #define N_BURST_IMAGES 10
#define DEFAULT_UI_FILE "gst-camera.ui" #define UI_FILE CAMERA_APPS_UIDIR G_DIR_SEPARATOR_S "gst-camera.ui"
#define SHARED_UI_FILE CAMERA_APPS_UIDIR"/"DEFAULT_UI_FILE
/* Names of default elements */ /* Names of default elements */
#define CAMERA_APP_VIDEOSRC "v4l2src" #define CAMERA_APP_VIDEOSRC "v4l2src"
@ -762,7 +761,7 @@ set_metadata (void)
/* for more information about image metadata tags, see: /* for more information about image metadata tags, see:
* http://webcvs.freedesktop.org/gstreamer/gst-plugins-bad/tests/icles/metadata_editor.c * http://webcvs.freedesktop.org/gstreamer/gst-plugins-bad/tests/icles/metadata_editor.c
* and for the mapping: * and for the mapping:
* http://webcvs.freedesktop.org/gstreamer/gst-plugins-bad/ext/metadata/metadata_mapping.htm?view=co * http://webcvs.freedesktop.org/gstreamer/gst-plugins-bad/ext/metadata/metadata_mapping.htm?view=co
*/ */
GstTagSetter *setter = GST_TAG_SETTER (gst_camera_bin); GstTagSetter *setter = GST_TAG_SETTER (gst_camera_bin);
@ -1622,14 +1621,9 @@ static gboolean
ui_create (void) ui_create (void)
{ {
GError *error = NULL; GError *error = NULL;
const gchar *uifile = DEFAULT_UI_FILE;
if (!g_file_test (uifile, G_FILE_TEST_EXISTS)) {
uifile = SHARED_UI_FILE;
}
builder = gtk_builder_new (); builder = gtk_builder_new ();
if (!gtk_builder_add_from_file (builder, uifile, &error)) { if (!gtk_builder_add_from_file (builder, UI_FILE, &error)) {
g_warning ("Couldn't load builder file: %s", error->message); g_warning ("Couldn't load builder file: %s", error->message);
g_error_free (error); g_error_free (error);
goto done; goto done;

2
tests/examples/camerabin2/Makefile.am
View file

@ -21,7 +21,7 @@ gst_camera2_LDADD = \
noinst_DATA = $(GST_CAMERABIN_UI_FILES) noinst_DATA = $(GST_CAMERABIN_UI_FILES)
INCLUDES = -DCAMERA_APPS_UIDIR=\""$(uidir)"\" INCLUDES = -DCAMERA_APPS_UIDIR=\""$(srcdir)"\"
else else
GST_CAMERABIN_GTK_EXAMPLES = GST_CAMERABIN_GTK_EXAMPLES =

2
tests/examples/camerabin2/gst-camera2.c
View file

@ -37,7 +37,7 @@
#include <gdk/gdkx.h> #include <gdk/gdkx.h>
#include <gdk/gdkkeysyms.h> #include <gdk/gdkkeysyms.h>
#define UI_FILE "gst-camera2.ui" #define UI_FILE CAMERA_APPS_UIDIR G_DIR_SEPARATOR_S "gst-camera2.ui"
static GstElement *camera; static GstElement *camera;
static GtkBuilder *builder; static GtkBuilder *builder;