Rename files to prepare for merge with 5.0 branch

configure.ac

@@ -4,8 +4,8 @@ AM_MAINTAINER_MODE([enable])
 AC_PROG_CC
 AC_PROG_CXX
 AC_GNU_SOURCE
-AC_CONFIG_HEADERS([config.h])
-AC_CONFIG_SRCDIR([src/motion.c])
+AC_CONFIG_HEADERS([config.hpp])
+AC_CONFIG_SRCDIR([src/motion.cpp])
 AC_CANONICAL_HOST
 AC_CONFIG_MACRO_DIR([m4])
 
@@ -37,7 +37,7 @@ AS_IF([test "${PKGCONFIG}" = "no" ],[
 ###  Check pthread
 ##############################################################################
 AC_CHECK_HEADERS(pthread.h,,AC_MSG_ERROR([pthread is required.]))
-TEMP_CFLAGS="-D_THREAD_SAFE"
+TEMP_CFLAGS="-x c -D_THREAD_SAFE"
 LIBS="$LIBS -pthread "
 
 ##############################################################################
@@ -440,7 +440,7 @@ AS_IF([test "${PROTOTYPE_FLAGS}" = "yes"], [
   ]
 )
 
-
+CPPFLAGS="$CPPFLAGS $TEMP_CFLAGS"
 AC_SUBST(AM_CFLAGS, "$TEMP_CFLAGS")
 LIBS="$LIBS $TEMP_LIBS"
 AC_SUBST(AM_LDFLAGS, "$TEMP_LDFLAGS")

po/POTFILES.in

@@ -1,30 +1,30 @@
 # main sources
-src/alg.c
-src/conf.c
-src/dbse.c
-src/draw.c
-src/event.c
-src/ffmpeg.c
-src/jpegutils.c
-src/logger.c
-src/motion.c
-src/netcam.c
-src/netcam_ftp.c
-src/netcam_http.c
-src/netcam_jpeg.c
-src/netcam_rtsp.c
-src/netcam_wget.c
-src/picture.c
-src/rotate.c
-src/track.c
-src/translate.c
-src/util.c
-src/video_bktr.c
-src/video_common.c
-src/video_loopback.c
-src/video_v4l2.c
-src/webu.c
-src/webu_html.c
-src/webu_status.c
-src/webu_stream.c
-src/webu_text.c
+src/alg.cpp
+src/conf.cpp
+src/dbse.cpp
+src/draw.cpp
+src/event.cpp
+src/ffmpeg.cpp
+src/jpegutils.cpp
+src/logger.cpp
+src/motion.cpp
+src/netcam.cpp
+src/netcam_ftp.cpp
+src/netcam_http.cpp
+src/netcam_jpeg.cpp
+src/netcam_rtsp.cpp
+src/netcam_wget.cpp
+src/picture.cpp
+src/rotate.cpp
+src/track.cpp
+src/translate.cpp
+src/util.cpp
+src/video_bktr.cpp
+src/video_common.cpp
+src/video_loopback.cpp
+src/video_v4l2.cpp
+src/webu.cpp
+src/webu_html.cpp
+src/webu_status.cpp
+src/webu_stream.cpp
+src/webu_text.cpp

src/Makefile.am

@@ -4,34 +4,34 @@ LDADD = $(LIBINTL)
 bin_PROGRAMS = motion
 
 motion_SOURCES = \
-	alg.h alg.c \
-	conf.h conf.c \
-	dbse.h dbse.c \
-	draw.h draw.c \
-	event.h event.c \
-	ffmpeg.h ffmpeg.c \
-	jpegutils.h jpegutils.c \
-	logger.h logger.c \
-	motion.h motion.c \
-	netcam.h netcam.c \
-	netcam_ftp.h netcam_ftp.c \
-	netcam_http.h netcam_http.c \
-	netcam_jpeg.h netcam_jpeg.c \
-	netcam_rtsp.h netcam_rtsp.c \
-	netcam_wget.h netcam_wget.c \
-	picture.h picture.c \
-	rotate.h rotate.c \
-	track.h track.c \
-	translate.h translate.c \
-	util.h util.c \
-	video_bktr.h video_bktr.c \
-	video_common.h video_common.c \
-	video_loopback.h video_loopback.c \
-	video_v4l2.h video_v4l2.c \
-	webu.h webu.c \
-	webu_html.h webu_html.c \
-	webu_status.h webu_status.c \
-	webu_stream.h webu_stream.c \
-	webu_text.h webu_text.c \
-	mmx.h pwc-ioctl.h
+	alg.hpp alg.cpp  \
+	conf.hpp conf.cpp  \
+	dbse.hpp dbse.cpp  \
+	draw.hpp draw.cpp  \
+	event.hpp event.cpp  \
+	ffmpeg.hpp ffmpeg.cpp  \
+	jpegutils.hpp jpegutils.cpp  \
+	logger.hpp logger.cpp  \
+	motion.hpp motion.cpp  \
+	netcam.hpp netcam.cpp  \
+	netcam_ftp.hpp netcam_ftp.cpp  \
+	netcam_http.hpp netcam_http.cpp  \
+	netcam_jpeg.hpp netcam_jpeg.cpp  \
+	netcam_rtsp.hpp netcam_rtsp.cpp  \
+	netcam_wget.hpp netcam_wget.cpp  \
+	picture.hpp picture.cpp  \
+	rotate.hpp rotate.cpp  \
+	track.hpp track.cpp  \
+	translate.hpp translate.cpp  \
+	util.hpp util.cpp  \
+	video_bktr.hpp video_bktr.cpp  \
+	video_common.hpp video_common.cpp  \
+	video_loopback.hpp video_loopback.cpp  \
+	video_v4l2.hpp video_v4l2.cpp  \
+	webu.hpp webu.cpp  \
+	webu_html.hpp webu_html.cpp  \
+	webu_status.hpp webu_status.cpp  \
+	webu_stream.hpp webu_stream.cpp  \
+	webu_text.hpp webu_text.cpp  \
+	mmx.hpp pwc-ioctl.hpp
 

src/alg.c → src/alg.cpp

@@ -21,14 +21,14 @@
  *
  */
 
-#include "motion.h"
-#include "util.h"
-#include "draw.h"
-#include "alg.h"
+#include "motion.hpp"
+#include "util.hpp"
+#include "draw.hpp"
+#include "alg.hpp"
 
 #ifdef __MMX__
     #define HAVE_MMX
-    #include "mmx.h"
+    #include "mmx.hpp"
 #endif
 
 #define MAX2(x, y) ((x) > (y) ? (x) : (y))

src/alg.h → src/alg.hpp

@@ -23,7 +23,7 @@
 #ifndef _INCLUDE_ALG_H
 #define _INCLUDE_ALG_H
 
-#include "motion.h"
+#include "motion.hpp"
 
 struct coord {
     int x;

src/conf.c → src/conf.cpp

@@ -29,10 +29,10 @@
 
 #include <dirent.h>
 #include <string.h>
-#include "motion.h"
-#include "translate.h"
-#include "util.h"
-#include "logger.h"
+#include "motion.hpp"
+#include "translate.hpp"
+#include "util.hpp"
+#include "logger.hpp"
 
 #define EXTENSION ".conf"
 

src/dbse.c → src/dbse.cpp

@@ -21,11 +21,11 @@
  *
  */
 
-#include "motion.h"
-#include "translate.h"
-#include "util.h"
-#include "logger.h"
-#include "dbse.h"
+#include "motion.hpp"
+#include "translate.hpp"
+#include "util.hpp"
+#include "logger.hpp"
+#include "dbse.hpp"
 
 pthread_mutex_t dbse_lock;
 

src/draw.c → src/draw.cpp

@@ -24,9 +24,9 @@
  */
 
 #include <ctype.h>
-#include "motion.h"
-#include "util.h"
-#include "draw.h"
+#include "motion.hpp"
+#include "util.hpp"
+#include "draw.hpp"
 
 /* Highest ascii value is 126 (~) */
 #define ASCII_MAX 127

src/event.c → src/event.cpp

@@ -22,18 +22,18 @@
     Copyright Jeroen Vreeken, 2002
 */
 
-#include "motion.h"
-#include "translate.h"
-#include "util.h"
-#include "logger.h"
-#include "picture.h"
-#include "netcam.h"
-#include "netcam_rtsp.h"
-#include "ffmpeg.h"
-#include "event.h"
-#include "video_loopback.h"
-#include "video_common.h"
-#include "dbse.h"
+#include "motion.hpp"
+#include "translate.hpp"
+#include "util.hpp"
+#include "logger.hpp"
+#include "picture.hpp"
+#include "netcam.hpp"
+#include "netcam_rtsp.hpp"
+#include "ffmpeg.hpp"
+#include "event.hpp"
+#include "video_loopback.hpp"
+#include "video_common.hpp"
+#include "dbse.hpp"
 
 /*
  * TODO Items:

src/ffmpeg.c → src/ffmpeg.cpp

@@ -34,13 +34,13 @@
  * indicate libav
 */
 
-#include "motion.h"
-#include "translate.h"
-#include "util.h"
-#include "logger.h"
-#include "netcam.h"
-#include "netcam_rtsp.h"
-#include "ffmpeg.h"
+#include "motion.hpp"
+#include "translate.hpp"
+#include "util.hpp"
+#include "logger.hpp"
+#include "netcam.hpp"
+#include "netcam_rtsp.hpp"
+#include "ffmpeg.hpp"
 
 #ifdef HAVE_FFMPEG
 

src/ffmpeg.h → src/ffmpeg.hpp

@@ -26,7 +26,7 @@
 #include <stdarg.h>
 #include <sys/time.h>
 #include <stdint.h>
-#include "config.h"
+#include "config.hpp"
 struct image_data; /* forward declare for functions */
 struct rtsp_context;
 

src/jpegutils.c → src/jpegutils.cpp

@@ -51,13 +51,13 @@
  *    jpgutl_decode_jpeg
  */
 
-#include "motion.h"
-#include "config.h"
-#include "translate.h"
-#include "util.h"
-#include "logger.h"
-#include "jpegutils.h"
-#include "picture.h"    /* For the prepare_exif */
+#include "motion.hpp"
+#include "config.hpp"
+#include "translate.hpp"
+#include "util.hpp"
+#include "logger.hpp"
+#include "jpegutils.hpp"
+#include "picture.hpp"    /* For the prepare_exif */
 #include <setjmp.h>
 
 

src/logger.c → src/logger.cpp

@@ -24,8 +24,8 @@
  *
  */
 
-#include "logger.h"   /* already includes motion.h */
-#include "util.h"
+#include "logger.hpp"   /* already includes motion.h */
+#include "util.hpp"
 #include <stdarg.h>
 
 static int log_mode = LOGMODE_SYSLOG;

src/logger.h → src/logger.hpp

@@ -24,7 +24,7 @@
 #ifndef _INCLUDE_LOGGER_H_
 #define _INCLUDE_LOGGER_H_
 
-#include "motion.h"
+#include "motion.hpp"
 #include <syslog.h>
 
 /* Logging mode */

src/motion.c → src/motion.cpp

@@ -20,25 +20,25 @@
  *    Copyright 2000 by Jeroen Vreeken (pe1rxq@amsat.org)
  *
  */
-#include "motion.h"
-#include "translate.h"
-#include "util.h"
-#include "logger.h"
-#include "ffmpeg.h"
-#include "netcam.h"
-#include "netcam_rtsp.h"
-#include "video_common.h"
-#include "video_v4l2.h"
-#include "video_loopback.h"
-#include "conf.h"
-#include "alg.h"
-#include "track.h"
-#include "event.h"
-#include "picture.h"
-#include "rotate.h"
-#include "webu.h"
-#include "draw.h"
-#include "dbse.h"
+#include "motion.hpp"
+#include "translate.hpp"
+#include "util.hpp"
+#include "logger.hpp"
+#include "ffmpeg.hpp"
+#include "netcam.hpp"
+#include "netcam_rtsp.hpp"
+#include "video_common.hpp"
+#include "video_v4l2.hpp"
+#include "video_loopback.hpp"
+#include "conf.hpp"
+#include "alg.hpp"
+#include "track.hpp"
+#include "event.hpp"
+#include "picture.hpp"
+#include "rotate.hpp"
+#include "webu.hpp"
+#include "draw.hpp"
+#include "dbse.hpp"
 
 
 /**

src/motion.h → src/motion.hpp

@@ -29,7 +29,7 @@ struct image_data;
 struct rtsp_context;
 struct ffmpeg;
 
-#include "config.h"
+#include "config.hpp"
 
 /* Includes */
 #include <stdio.h>
@@ -111,8 +111,8 @@ struct ffmpeg;
 #endif
 
 /* Due to the pointer magic method of conf, the conf.h and track.h must stay in here */
-#include "conf.h"
-#include "track.h"
+#include "conf.hpp"
+#include "track.hpp"
 
 
 /*