timvideos · May 4, 2013 · May 6, 2013 · May 6, 2013 · May 7, 2013 · May 7, 2013
diff --git a/.gitignore b/.gitignore
@@ -48,3 +48,4 @@
 /record*.dat
 *.data
 *.log
+/tools/gst-switch-ptz
diff --git a/configure.ac b/configure.ac
@@ -22,6 +22,7 @@ AM_MAINTAINER_MODE([enable])
 dnl check for tools (compiler etc.)
 AC_PROG_CC
 AM_PROG_CC_C_O
+AC_PROG_CXX
 
 dnl required version of libtool
 LT_PREREQ([2.2.6])

diff --git a/icons b/icons
@@ -0,0 +1 @@
+./tools/icons
diff --git a/scripts/apps/app_stage.sh b/scripts/apps/app_stage.sh
@@ -54,10 +54,18 @@ function prepare-prerequisites()
 	libgtk-3-dev \
 	libmjpegtools-dev \
 	libtag1-dev \
+	libasound2-dev \
 	libtool \
 	libtoolize \
 	libvpx-dev \
+	libxv-dev \
+	libx11-dev \
+	libogg-dev \
+	libvorbis-dev \
 	libopencv-dev \
+	libcv-dev \
+	libhighgui-dev \
+	libv4l-dev \
 	pkg-config \
 	zlib1g-dev \
 	gtk-doc-tools \

diff --git a/tools/Makefile.am b/tools/Makefile.am
@@ -1,4 +1,4 @@
-bin_PROGRAMS = gst-switch-srv gst-switch-ui gst-switch-cap
+bin_PROGRAMS = gst-switch-srv gst-switch-ui gst-switch-cap gst-switch-ptz
 
 if GCOV_ENABLED
 # --coverage
@@ -34,9 +34,21 @@ gst_switch_cap_CFLAGS = $(GST_CFLAGS) $(GST_BASE_CFLAGS) $(GCOV_CFLAGS) \
   $(GST_PLUGINS_BASE_CFLAGS) $(X_CFLAGS) $(GTK_CFLAGS) \
   -DLOG_PREFIX="\"./tools\""
 gst_switch_cap_LDFLAGS = $(GCOV_LFLAGS) $(GST_LIBS) $(GST_BASE_LIBS) \
-  $(GST_PLUGINS_BASE_LIBS) $(GSTPB_BASE_LIBS)
+  $(GST_PLUGINS_BASE_LIBS) $(GSTPB_BASE_LIBS) -lm
 gst_switch_cap_LDADD = $(GST_LIBS) $(X_LIBS) $(LIBM) $(GTK_LIBS) $(GLIB_LIBS)
 
+gst_switch_ptz_SOURCES = gstworker.c gstvideodisp.c gstswitchptz.c
+gst_switch_ptz_CFLAGS = -g -ggdb $(GST_CFLAGS) $(GST_BASE_CFLAGS) $(GCOV_CFLAGS) \
+  $(GST_PLUGINS_BASE_CFLAGS) $(X_CFLAGS) $(GTK_CFLAGS) \
+  -DLOG_PREFIX="\".\""
+gst_switch_ptz_LDFLAGS = $(GCOV_LFLAGS) $(GST_LIBS) $(GST_BASE_LIBS) \
+  $(GST_PLUGINS_BASE_LIBS) $(GST_PLUGINS_BAD_LIBS) $(GSTPB_BASE_LIBS)
+gst_switch_ptz_LDADD = $(GST_LIBS) $(X_LIBS) $(LIBM) $(GTK_LIBS) \
+  $(GLIB_LIBS) -lm \
+  $(HOME)/gst/stage/lib/libgstcamcontrol-1.0.so
+
+#  -lgstcamcontrol
+
 if GCOV_ENABLED
 coverage:
 	gcov gst_switch_srv-*.o

diff --git a/tools/gstswitchptz.c b/tools/gstswitchptz.c
diff --git a/tools/gstswitchptz.cpp b/tools/gstswitchptz.cpp
@@ -0,0 +1,35 @@
+/* GstSwitch							    -*- c -*-
+ * Copyright (C) 2013 Duzy Chan <code@duzy.info>
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
+ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+extern "C" gboolean verbose;
+
+int main(int argc, char**argv)
+{
+    return 0;
+}
diff --git a/tools/gstswitchptz.h b/tools/gstswitchptz.h
@@ -0,0 +1,61 @@
+/* GstSwitch							    -*- c -*-
+ * Copyright (C) 2013 Duzy Chan <code@duzy.info>
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
+ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef __GST_SWITCH_PTZ_H____by_Duzy_Chan__
+#define __GST_SWITCH_PTZ_H____by_Duzy_Chan__ 1
+#include <gdk/gdkx.h>
+#include <gtk/gtk.h>
+#include "gstworker.h"
+
+#define GST_TYPE_SWITCH_PTZ (gst_switch_ptz_get_type ())
+#define GST_SWITCH_PTZ(object) (G_TYPE_CHECK_INSTANCE_CAST ((object), GST_TYPE_SWITCH_PTZ, GstSwitchPTZ))
+#define GST_SWITCH_PTZ_CLASS(class) (G_TYPE_CHECK_CLASS_CAST ((class), GST_TYPE_SWITCH_PTZ, GstSwitchPTZClass))
+#define GST_IS_SWITCH_PTZ(object) (G_TYPE_CHECK_INSTANCE_TYPE ((object), GST_TYPE_SWITCH_PTZ))
+#define GST_IS_SWITCH_PTZ_CLASS(class) (G_TYPE_CHECK_CLASS_TYPE ((class), GST_TYPE_SWITCH_PTZ))
+
+typedef struct _GstSwitchPTZ
+{
+    GstWorker base;
+
+    GtkWidget *window;
+    GtkWidget *video_view;
+    GtkAdjustment *adjust_pan_speed;
+    GtkAdjustment *adjust_pan;
+    GtkAdjustment *adjust_tilt_speed;
+    GtkAdjustment *adjust_tilt;
+    GtkAdjustment *adjust_zoom_speed;
+    GtkAdjustment *adjust_zoom;
+
+    GstCamController *controller;
+} GstSwitchPTZ;
+
+typedef struct _GstSwitchPTZClass
+{
+    GstWorkerClass base_class;
+} GstSwitchPTZClass;
+
+GType gst_switch_ptz_get_type (void);
+
+#endif//__GST_SWITCH_PTZ_H____by_Duzy_Chan__
diff --git a/tools/icons/center.png b/tools/icons/center.png
diff --git a/tools/icons/down.png b/tools/icons/down.png
diff --git a/tools/icons/down_left.png b/tools/icons/down_left.png
diff --git a/tools/icons/down_right.png b/tools/icons/down_right.png
diff --git a/tools/icons/left.png b/tools/icons/left.png
diff --git a/tools/icons/right.png b/tools/icons/right.png
diff --git a/tools/icons/up.png b/tools/icons/up.png
diff --git a/tools/icons/up_left.png b/tools/icons/up_left.png
diff --git a/tools/icons/up_right.png b/tools/icons/up_right.png
diff --git a/tools/icons/zoom.png b/tools/icons/zoom.png
diff --git a/tools/icons/zoom_in.png b/tools/icons/zoom_in.png
diff --git a/tools/icons/zoom_out.png b/tools/icons/zoom_out.png
-Original file line number
+Diff line change
@@ @@ -48,3 +48,4 @@ @@
     /record*.dat
     *.data
     *.log
+    /tools/gst-switch-ptz