Rename files to prepare for merge with 5.0 branch

This commit is contained in:
Mr-Dave
2025-02-04 16:13:34 -07:00
parent 8d69cbf27a
commit aa285e17dd
65 changed files with 259 additions and 259 deletions

View File

@@ -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")

View File

View File

View File

@@ -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

View File

@@ -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

View File

@@ -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))

View File

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

View File

@@ -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"

View File

View File

@@ -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;

View File

View File

@@ -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

View File

View File

@@ -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:

View File

View File

@@ -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

View File

@@ -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;

View File

@@ -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>

View File

View File

@@ -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;

View File

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

View File

View File

@@ -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"
/**

View File

@@ -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"
/*

View File

@@ -21,13 +21,13 @@
*
*/
#include "motion.h"
#include "translate.h"
#include "util.h"
#include "logger.h"
#include "netcam.h"
#include "netcam_http.h"
#include "netcam_ftp.h"
#include "motion.hpp"
#include "translate.hpp"
#include "util.hpp"
#include "logger.hpp"
#include "netcam.hpp"
#include "netcam_http.hpp"
#include "netcam_ftp.hpp"
/*
* The following three routines (netcam_url_match, netcam_url_parse and

View File

@@ -55,8 +55,8 @@
typedef struct netcam_context *netcam_context_ptr;
#include "netcam_wget.h"
#include "netcam_jpeg.h"
#include "netcam_wget.hpp"
#include "netcam_jpeg.hpp"
#define NETCAM_BUFFSIZE 4096 /* Initial size reserved for a JPEG
image. If expansion is required,

View File

@@ -22,15 +22,15 @@
* Copyright 2005, William M. Brack
*
*/
#include "motion.h"
#include "translate.h"
#include "util.h"
#include "logger.h"
#include "motion.hpp"
#include "translate.hpp"
#include "util.hpp"
#include "logger.hpp"
#include <ctype.h>
#include <netdb.h>
#include <netinet/in.h>
#include "netcam.h"
#include "netcam_ftp.h"
#include "netcam.hpp"
#include "netcam_ftp.hpp"
/**
* ftp_new_context

View File

View File

@@ -25,12 +25,12 @@
* Copyright 2005, William M. Brack
***********************************************************/
#include "motion.h"
#include "translate.h"
#include "util.h"
#include "logger.h"
#include "netcam.h"
#include "netcam_http.h"
#include "motion.hpp"
#include "translate.hpp"
#include "util.hpp"
#include "logger.hpp"
#include "netcam.hpp"
#include "netcam_http.hpp"
#define CONNECT_TIMEOUT 10 /* Timeout on remote connection attempt */
#define READ_TIMEOUT 5 /* Default timeout on recv requests */

View File

View File

@@ -26,13 +26,13 @@
*
* Copyright 2005, William M. Brack
*/
#include "motion.h"
#include "translate.h"
#include "util.h"
#include "logger.h"
#include "rotate.h"
#include "netcam.h"
#include "netcam_jpeg.h"
#include "motion.hpp"
#include "translate.hpp"
#include "util.hpp"
#include "logger.hpp"
#include "rotate.hpp"
#include "netcam.hpp"
#include "netcam_jpeg.hpp"
/* This is a workaround regarding these defines. The config.h file defines
* HAVE_STDLIB_H as 1 whereas the jpeglib.h just defines it without a value.

View File

View File

@@ -40,17 +40,17 @@
***********************************************************/
#include <stdio.h>
#include "motion.h"
#include "translate.h"
#include "util.h"
#include "logger.h"
#include "rotate.h"
#include "netcam.h"
#include "netcam_rtsp.h"
#include "motion.hpp"
#include "translate.hpp"
#include "util.hpp"
#include "logger.hpp"
#include "rotate.hpp"
#include "netcam.hpp"
#include "netcam_rtsp.hpp"
#ifdef HAVE_FFMPEG
#include "ffmpeg.h"
#include "ffmpeg.hpp"
static void netcam_rtsp_free_pkt(struct rtsp_context *rtsp_data)
{

View File

View File

@@ -27,10 +27,10 @@
*
*/
#include "motion.h"
#include "util.h"
#include "netcam.h"
#include "netcam_wget.h"
#include "motion.hpp"
#include "util.hpp"
#include "netcam.hpp"
#include "netcam_wget.hpp"
#include <ctype.h>
#include <sys/types.h>
#include <sys/socket.h>

View File

@@ -29,7 +29,7 @@
#ifndef NETCAM_WGET_H
#define NETCAM_WGET_H
#include "netcam.h"
#include "netcam.hpp"
/* Retrieval stream */
struct rbuf

View File

@@ -22,14 +22,14 @@
* Portions of this file are Copyright 2010 by Wim Lewis (wiml@hhhh.org)
*
*/
#include "motion.h"
#include "translate.h"
#include "util.h"
#include "logger.h"
#include "picture.h"
#include "jpegutils.h"
#include "event.h"
#include "netcam.h"
#include "motion.hpp"
#include "translate.hpp"
#include "util.hpp"
#include "logger.hpp"
#include "picture.hpp"
#include "jpegutils.hpp"
#include "event.hpp"
#include "netcam.hpp"
#include <assert.h>

View File

View File

View File

@@ -42,11 +42,11 @@
* - speed optimization, including bswap
* v1 (28-Aug-2004) - initial version
*/
#include "motion.h"
#include "translate.h"
#include "util.h"
#include "logger.h"
#include "rotate.h"
#include "motion.hpp"
#include "translate.hpp"
#include "util.hpp"
#include "logger.hpp"
#include "rotate.hpp"
#include <stdint.h>
#if defined(__APPLE__)
#include <libkern/OSByteOrder.h>

View File

View File

@@ -21,10 +21,10 @@
* Copyright 2000, Jeroen Vreeken
*/
#include <math.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"
#ifdef HAVE_V4L2
#if defined(HAVE_LINUX_VIDEODEV2_H)
@@ -32,7 +32,7 @@
#else
#include <sys/videoio.h>
#endif
#include "pwc-ioctl.h"
#include "pwc-ioctl.hpp"
#endif

View File

@@ -23,7 +23,7 @@
#ifndef _INCLUDE_TRACK_H
#define _INCLUDE_TRACK_H
#include "alg.h"
#include "alg.hpp"
#include <termios.h>
struct trackoptions {

View File

@@ -21,9 +21,9 @@
*/
#include <locale.h>
#include "motion.h"
#include "logger.h"
#include "translate.h"
#include "motion.hpp"
#include "logger.hpp"
#include "translate.hpp"
int nls_enabled;

View File

View File

@@ -21,10 +21,10 @@
*
*/
#include "motion.h"
#include "translate.h"
#include "logger.h"
#include "util.h"
#include "motion.hpp"
#include "translate.hpp"
#include "logger.hpp"
#include "util.hpp"
#ifdef HAVE_FFMPEG

View File

View File

@@ -22,13 +22,13 @@
*/
/* For rotation */
#include "motion.h"
#include "util.h"
#include "translate.h"
#include "logger.h"
#include "rotate.h"
#include "video_common.h"
#include "video_bktr.h"
#include "motion.hpp"
#include "util.hpp"
#include "translate.hpp"
#include "logger.hpp"
#include "rotate.hpp"
#include "video_common.hpp"
#include "video_bktr.hpp"
#ifdef HAVE_BKTR

View File

View File

@@ -22,16 +22,16 @@
* 2007 by Angel Carpintero (motiondevelop@gmail.com)
*
*/
#include "motion.h"
#include "translate.h"
#include "util.h"
#include "logger.h"
#include "video_common.h"
#include "netcam.h"
#include "netcam_rtsp.h"
#include "video_v4l2.h"
#include "video_bktr.h"
#include "jpegutils.h"
#include "motion.hpp"
#include "translate.hpp"
#include "util.hpp"
#include "logger.hpp"
#include "video_common.hpp"
#include "netcam.hpp"
#include "netcam_rtsp.hpp"
#include "video_v4l2.hpp"
#include "video_bktr.hpp"
#include "jpegutils.hpp"
typedef unsigned char uint8_t;
typedef unsigned short int uint16_t;

View File

View File

@@ -22,14 +22,14 @@
* Copyright 2008 by Angel Carpintero (motiondevelop@gmail.com)
*
*/
#include "motion.h"
#include "translate.h"
#include "util.h"
#include "logger.h"
#include "motion.hpp"
#include "translate.hpp"
#include "util.hpp"
#include "logger.hpp"
#if (defined(HAVE_V4L2)) && (!defined(BSD))
#include "video_loopback.h"
#include "video_loopback.hpp"
#include <dirent.h>
#include <sys/ioctl.h>
#include <linux/videodev2.h>

View File

@@ -23,13 +23,13 @@
* Refactor/rewrite code: 2018 MrDave
*
*/
#include "motion.h"
#include "translate.h"
#include "util.h"
#include "logger.h"
#include "rotate.h"
#include "video_common.h"
#include "video_v4l2.h"
#include "motion.hpp"
#include "translate.hpp"
#include "util.hpp"
#include "logger.hpp"
#include "rotate.hpp"
#include "video_common.hpp"
#include "video_v4l2.hpp"
#include <sys/mman.h>

View File

View File

@@ -45,15 +45,15 @@
#include <arpa/inet.h>
#include <sys/socket.h>
#include "motion.h"
#include "util.h"
#include "logger.h"
#include "webu.h"
#include "webu_html.h"
#include "webu_text.h"
#include "webu_stream.h"
#include "webu_status.h"
#include "translate.h"
#include "motion.hpp"
#include "util.hpp"
#include "logger.hpp"
#include "webu.hpp"
#include "webu_html.hpp"
#include "webu_text.hpp"
#include "webu_stream.hpp"
#include "webu_status.hpp"
#include "translate.hpp"
static mymhd_retcd webu_mhd_send(struct webui_ctx *webui, int ctrl);

View File

View File

@@ -46,12 +46,12 @@
*
*/
#include "motion.h"
#include "util.h"
#include "logger.h"
#include "webu.h"
#include "webu_html.h"
#include "translate.h"
#include "motion.hpp"
#include "util.hpp"
#include "logger.hpp"
#include "webu.hpp"
#include "webu_html.hpp"
#include "translate.hpp"
/* struct to save information regarding the links to include in html page */
struct strminfo_ctx {

View File

View File

@@ -24,9 +24,9 @@
#include <ctype.h>
#include <inttypes.h>
#include "motion.h"
#include "webu.h"
#include "webu_status.h"
#include "motion.hpp"
#include "webu.hpp"
#include "webu_status.hpp"
/* Conservatively encode characters in an array as a JSON string */
static void webu_json_write_string(struct webui_ctx *webui, const char *str)

View File

View File

@@ -26,12 +26,12 @@
* webu_stream_checks - Edit/validate request from user
*/
#include "motion.h"
#include "util.h"
#include "logger.h"
#include "webu.h"
#include "webu_stream.h"
#include "translate.h"
#include "motion.hpp"
#include "util.hpp"
#include "logger.hpp"
#include "webu.hpp"
#include "webu_stream.hpp"
#include "translate.hpp"
void webu_stream_deinit(struct webui_ctx *webui, struct stream_data *stream)
{

View File

View File

@@ -32,12 +32,12 @@
*
*/
#include "motion.h"
#include "util.h"
#include "logger.h"
#include "webu.h"
#include "webu_text.h"
#include "translate.h"
#include "motion.hpp"
#include "util.hpp"
#include "logger.hpp"
#include "webu.hpp"
#include "webu_text.hpp"
#include "translate.hpp"
static void webu_text_seteol(struct webui_ctx *webui)
{

View File