ZoneMinder
/
zoneminder
mirror of https://github.com/ZoneMinder/zoneminder.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Google code style, ifdef out all the extra includs that shouldn't be in the .h

pull/2653/head
Isaac Connor 2019-06-27 10:29:47 -04:00
parent 6a87ae0fa7
commit 6ed29a3d56
1 changed files with 59 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

93
src/zm_fifo.h
View File

@ -1,6 +1,25 @@
//
// ZoneMinder Fifo Debug
// Copyright (C) 2019 ZoneMinder LLC
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
// of the License, or (at your option) any later version.
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
//
#ifndef ZM_FIFO_H #ifndef ZM_FIFO_H
#define ZM_FIFO_H #define ZM_FIFO_H
#if 0
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <unistd.h> #include <unistd.h>
@ -13,49 +32,55 @@
#include "zm.h" #include "zm.h"
#include "zm_image.h" #include "zm_image.h"
#endif
#include "zm_monitor.h" #include "zm_monitor.h"
#include "zm_stream.h" #include "zm_stream.h"
#define zmFifoDbgPrintf(level, params...) {\
#define zmFifoDbgPrintf(level,params...) {\ zmFifoDbgOutput(0, __FILE__, __LINE__, level, ##params);\
zmFifoDbgOutput( 0, __FILE__, __LINE__, level, ##params );\ }
}
#ifndef ZM_DBG_OFF #ifndef ZM_DBG_OFF
#define FifoDebug(level,params...) zmFifoDbgPrintf(level,##params) #define FifoDebug(level, params...) zmFifoDbgPrintf(level, ##params)
#else #else
#define FifoDebug(level,params...) #define FifoDebug(level, params...)
#endif #endif
void zmFifoDbgOutput( int hex, const char * const file, const int line, const int level, const char *fstring, ... ) __attribute__ ((format(printf, 5, 6))); void zmFifoDbgOutput(
int hex,
const char * const file,
const int line,
const int level,
const char *fstring,
...) __attribute__((format(printf, 5, 6)));
int zmFifoDbgInit(Monitor * monitor); int zmFifoDbgInit(Monitor * monitor);
class FifoStream : public StreamBase class FifoStream : public StreamBase {
{ private:
char * stream_path;
int fd;
int total_read;
int bytes_read;
unsigned int frame_count;
static void file_create_if_missing(
const char * path,
bool is_fifo,
bool delete_fake_fifo = true
);
private: protected:
char * stream_path; typedef enum { MJPEG, RAW } StreamType;
int fd; StreamType stream_type;
int total_read; bool sendMJEGFrames();
int bytes_read; bool sendRAWFrames();
unsigned int frame_count; void processCommand(const CmdMsg *msg) {}
static void file_create_if_missing(const char * path, bool is_fifo, bool delete_fake_fifo=true);
protected: public:
typedef enum { MJPEG, RAW } StreamType; FifoStream() {}
StreamType stream_type; static void fifo_create_if_missing(
bool sendMJEGFrames( ); const char * path,
bool sendRAWFrames( ); bool delete_fake_fifo = true);
void processCommand( const CmdMsg *msg ) {}; void setStreamStart(const char * path);
void setStreamStart(int monitor_id, const char * format);
public: void runStream();
FifoStream(){
}
static void fifo_create_if_missing(const char * path,bool delete_fake_fifo=true);
void setStreamStart( const char * path );
void setStreamStart( int monitor_id, const char * format );
void runStream();
}; };
#endif #endif // ZM_FIFO_H