summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--TODO4
-rw-r--r--pixmaps/Makefile.am8
-rw-r--r--src/aboutwindow.cc32
-rw-r--r--src/aboutwindow.h16
-rw-r--r--src/camera.cc60
-rw-r--r--src/camera.h43
-rw-r--r--src/cprquerydialog.cc23
-rw-r--r--src/cprquerydialog.h17
-rw-r--r--src/debug.h14
-rw-r--r--src/decoder.cc57
-rw-r--r--src/decoder.h36
-rw-r--r--src/dv.h14
-rw-r--r--src/dv1394.cc17
-rw-r--r--src/dv1394.h17
-rw-r--r--src/encoder.cc53
-rw-r--r--src/encoder.h31
-rw-r--r--src/file.cc34
-rw-r--r--src/file.h20
-rw-r--r--src/frame.cc30
-rw-r--r--src/frame.h32
-rw-r--r--src/historywidget.cc12
-rw-r--r--src/historywidget.h12
-rw-r--r--src/img_encoder.cc27
-rw-r--r--src/img_encoder.h21
-rw-r--r--src/info.cc19
-rw-r--r--src/info.h9
-rw-r--r--src/info_console.cc9
-rw-r--r--src/info_console.h9
-rw-r--r--src/info_gui.cc9
-rw-r--r--src/info_gui.h9
-rw-r--r--src/libfame_wrapper.cc19
-rw-r--r--src/libfame_wrapper.h13
-rw-r--r--src/liblame_wrapper.cc25
-rw-r--r--src/liblame_wrapper.h22
-rw-r--r--src/mainwindow.cc163
-rw-r--r--src/mainwindow.h63
-rw-r--r--src/messagebox.cc29
-rw-r--r--src/messagebox.h15
-rw-r--r--src/miav.cc45
-rw-r--r--src/miav.h14
-rw-r--r--src/miav_config.cc27
-rw-r--r--src/miav_config.h21
-rw-r--r--src/miav_daemon.cc25
-rw-r--r--src/miav_daemon.h12
-rw-r--r--src/mov_encoder.cc102
-rw-r--r--src/mov_encoder.h44
-rw-r--r--src/mov_encoder_thread.cc50
-rw-r--r--src/mov_encoder_thread.h36
-rw-r--r--src/mov_encoder_writer.cc46
-rw-r--r--src/mov_encoder_writer.h32
-rw-r--r--src/network.cc19
-rw-r--r--src/network.h14
-rw-r--r--src/package.h14
-rw-r--r--src/player.cc44
-rw-r--r--src/player.h35
-rw-r--r--src/queue.h30
-rw-r--r--src/server.cc65
-rw-r--r--src/server.h18
-rw-r--r--src/server_status.cc38
-rw-r--r--src/server_status.h23
-rw-r--r--src/socket.cc27
-rw-r--r--src/socket.h23
-rw-r--r--src/thread.cc19
-rw-r--r--src/thread.h20
-rw-r--r--src/util.cc14
-rw-r--r--src/util.h15
-rw-r--r--src/videowidget.cc32
-rw-r--r--src/videowidget.h26
-rwxr-xr-xtools/MIaVAdd11
70 files changed, 71 insertions, 1918 deletions
diff --git a/ChangeLog b/ChangeLog
index 8d7fd82..91061d7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -10,9 +10,12 @@ New Features:
- Man pages have been written.
- Added server_image_root and server_movie_root to the config file.
- Added 'encrypted' filenames for the image files.
- - Added audio encoding and mulitplexing to the output file.
+ - Added audio encoding and multiplexing to the output file.
Audio is out of sync though! :-(
- Added mp3 control parameters to the config file.
+ - Added fullscreen view of the videofield (click it to activate/deactivate)
+ - Added fullscreen view of the screenshots (click it to activate/deactivate)
+ - Added about dialog.
Bug Fixes:
- Config variables can now contain numbers.
diff --git a/TODO b/TODO
index 2d7a403..d91ff03 100644
--- a/TODO
+++ b/TODO
@@ -58,8 +58,8 @@ Mainwindow:
(Save, Delete, Cancel, Save in one week)
[x] - Make "clear" button in mainwindow, to remove last patient, before
the next enters.
- [ ] - Realscale all window components.
- [ ] - Realscale all icons (use highresolution icons and scale them down)
+ [x] - Realscale all window components.
+ [x] - Realscale all icons (use highresolution icons and scale them down)
[ ] - Test it.
CPRQueryDialog:
diff --git a/pixmaps/Makefile.am b/pixmaps/Makefile.am
index af77512..c6d8e0b 100644
--- a/pixmaps/Makefile.am
+++ b/pixmaps/Makefile.am
@@ -3,9 +3,7 @@ EXTRA_DIST = \
cpr.png \
dummy.png \
freeze.png \
- miav-logo-256x256.png \
- miav-logo-512x512.png \
- miav-logo-64x64.png \
+ miav-logo.png \
record.png \
snapshot.png \
stop.png \
@@ -23,9 +21,7 @@ pixmap_DATA = \
cpr.png \
dummy.png \
freeze.png \
- miav-logo-256x256.png \
- miav-logo-512x512.png \
- miav-logo-64x64.png \
+ miav-logo.png \
record.png \
snapshot.png \
stop.png \
diff --git a/src/aboutwindow.cc b/src/aboutwindow.cc
index 4cf1caa..e5a487c 100644
--- a/src/aboutwindow.cc
+++ b/src/aboutwindow.cc
@@ -24,20 +24,6 @@
* along with MIaV; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
-
-/*
- * $Id$
- */
-
-/*
- * $Log$
- * Revision 1.3 2005/05/03 08:31:58 deva
- * Removed the error object, and replaced it with a more generic info object.
- *
- * Revision 1.2 2005/05/01 09:56:25 deva
- * Added Id and Log tags to all files
- */
-
#include <config.h>
#ifdef USE_GUI
@@ -53,20 +39,20 @@ AboutWindow::AboutWindow( QWidget* parent, const char* name )
: QDialog( parent, name )
{
resize(320,460);
-// setModal(true);
+ setModal(true);
pix_logo = new QPixmap();
- pix_logo->load("miav-logo-512x512.png");
-
+ pix_logo->load( PIXMAP_LOGO );
+
setBackgroundColor(QColor(150,150,150));
- btn_ok = new QPushButton(this);
+ btn_ok = new QPushButton(this);
btn_ok->setText("OK");
btn_ok->move(200, 410);
- btn_ok->resize( 95, 40 );
- btn_ok->setFont( QFont( "Arial", 12, QFont::Bold ) );
-
- QObject::connect( btn_ok, SIGNAL(clicked()), this, SLOT(close()) );
-
+ btn_ok->resize( 95, 40 );
+ btn_ok->setFont( QFont( "Arial", 12, QFont::Bold ) );
+
+ QObject::connect( btn_ok, SIGNAL(clicked()), this, SLOT(close()) );
+
show();
}
diff --git a/src/aboutwindow.h b/src/aboutwindow.h
index 2e28569..ea956a6 100644
--- a/src/aboutwindow.h
+++ b/src/aboutwindow.h
@@ -24,20 +24,6 @@
* along with MIaV; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
-
-/*
- * $Id$
- */
-
-/*
- * $Log$
- * Revision 1.3 2005/05/03 08:31:58 deva
- * Removed the error object, and replaced it with a more generic info object.
- *
- * Revision 1.2 2005/05/01 09:56:25 deva
- * Added Id and Log tags to all files
- */
-
#include <config.h>
#ifdef USE_GUI
@@ -50,6 +36,8 @@
//#include <qtextedit.h>
#include <qpushbutton.h>
+#define PIXMAP_LOGO PIXMAPS"/miav-logo.png"
+
#define ABOUT_INFO "\
Official homepage:\n\
http://www.aasimon.org/miav\n\
diff --git a/src/camera.cc b/src/camera.cc
index 75ec63a..4cb9ad9 100644
--- a/src/camera.cc
+++ b/src/camera.cc
@@ -24,66 +24,6 @@
* along with MIaV; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
-
-/*
- * $Id$
- */
-
-/*
- * $Log$
- * Revision 1.22 2005/07/26 16:16:56 deva
- *
- * Added fullscreen functionality.
- *
- * Revision 1.21 2005/07/25 16:18:34 deva
- * *** empty log message ***
- *
- * Revision 1.20 2005/07/25 15:56:27 deva
- * *** empty log message ***
- *
- * Revision 1.19 2005/07/25 12:42:13 deva
- * *** empty log message ***
- *
- * Revision 1.18 2005/06/16 21:28:57 deva
- * Rewrote thread object
- * Fixed bug in mov_encoder (pushed read_sem too many times, whihc lead to
- * growing server queue)
- *
- * Revision 1.17 2005/05/25 13:11:42 deva
- *
- * Made unfreeze close connection, when no recording is done.
- *
- * Revision 1.16 2005/05/16 16:00:56 deva
- *
- * Lots of stuff!
- *
- * Revision 1.15 2005/05/07 10:25:34 deva
- *
- * Removed ffmpeg code from img_encoder and corrected decoding errors in mov_encoder
- *
- * Revision 1.14 2005/05/03 08:31:59 deva
- * Removed the error object, and replaced it with a more generic info object.
- *
- * Revision 1.13 2005/05/02 14:06:55 deva
- * Added unfreeze to decoder (called from camera).
- *
- * Revision 1.12 2005/05/02 10:35:23 deva
- * Fixed wrongly showed snapshot thumbnails.
- *
- * Revision 1.11 2005/05/02 09:58:43 deva
- *
- * Fixed initial values of the stae bools.
- *
- * Revision 1.10 2005/05/02 09:50:22 deva
- * Rewrote freeze, shoot and record flags, from encoder to frame.
- *
- * Revision 1.9 2005/05/01 11:25:56 deva
- * Added code to read screenshot from frame queue, decode it to rgb and put it into a qimage.
- *
- * Revision 1.8 2005/05/01 09:56:26 deva
- * Added Id and Log tags to all files
- */
-
#include <config.h>
#ifdef USE_GUI
diff --git a/src/camera.h b/src/camera.h
index 92f11e8..f1aaa3c 100644
--- a/src/camera.h
+++ b/src/camera.h
@@ -24,49 +24,6 @@
* along with MIaV; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
-
-/*
- * $Id$
- */
-
-/*
- * $Log$
- * Revision 1.17 2005/07/26 16:16:56 deva
- *
- * Added fullscreen functionality.
- *
- * Revision 1.16 2005/07/25 16:18:34 deva
- * *** empty log message ***
- *
- * Revision 1.15 2005/07/25 15:56:27 deva
- * *** empty log message ***
- *
- * Revision 1.14 2005/07/25 12:42:13 deva
- * *** empty log message ***
- *
- * Revision 1.13 2005/06/16 21:28:57 deva
- * Rewrote thread object
- * Fixed bug in mov_encoder (pushed read_sem too many times, whihc lead to
- * growing server queue)
- *
- * Revision 1.12 2005/05/16 16:00:56 deva
- *
- * Lots of stuff!
- *
- * Revision 1.11 2005/05/07 10:25:34 deva
- *
- * Removed ffmpeg code from img_encoder and corrected decoding errors in mov_encoder
- *
- * Revision 1.10 2005/05/03 08:31:59 deva
- * Removed the error object, and replaced it with a more generic info object.
- *
- * Revision 1.9 2005/05/01 11:25:56 deva
- * Added code to read screenshot from frame queue, decode it to rgb and put it into a qimage.
- *
- * Revision 1.8 2005/05/01 09:56:26 deva
- * Added Id and Log tags to all files
- */
-
#include <config.h>
#ifdef USE_GUI
diff --git a/src/cprquerydialog.cc b/src/cprquerydialog.cc
index c683cf4..4506e42 100644
--- a/src/cprquerydialog.cc
+++ b/src/cprquerydialog.cc
@@ -24,29 +24,6 @@
* along with MIaV; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
-
-/*
- * $Id$
- */
-
-/*
- * $Log$
- * Revision 1.12 2005/05/23 19:30:36 deva
- * Made some cleanup in the status bar.
- *
- * Revision 1.11 2005/05/23 18:08:02 deva
- * Name is now overwritten if non-valid cpr is used.
- *
- * Revision 1.10 2005/05/03 08:31:59 deva
- * Removed the error object, and replaced it with a more generic info object.
- *
- * Revision 1.9 2005/05/02 20:03:24 deva
- * Added backspace arrow to cprquery dialog. (Replaced old ascii '<-')
- *
- * Revision 1.8 2005/05/01 09:56:26 deva
- * Added Id and Log tags to all files
- */
-
#include <config.h>
#ifdef USE_GUI
diff --git a/src/cprquerydialog.h b/src/cprquerydialog.h
index d862ae6..78a677b 100644
--- a/src/cprquerydialog.h
+++ b/src/cprquerydialog.h
@@ -24,23 +24,6 @@
* along with MIaV; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
-
-/*
- * $Id$
- */
-
-/*
- * $Log$
- * Revision 1.8 2005/05/03 08:31:59 deva
- * Removed the error object, and replaced it with a more generic info object.
- *
- * Revision 1.7 2005/05/02 20:03:24 deva
- * Added backspace arrow to cprquery dialog. (Replaced old ascii '<-')
- *
- * Revision 1.6 2005/05/01 09:56:26 deva
- * Added Id and Log tags to all files
- */
-
#ifndef __MIAV_CPRQUERYDIALOG_H__
#define __MIAV_CPRQUERYDIALOG_H__
diff --git a/src/debug.h b/src/debug.h
index 222c9af..9caa8d7 100644
--- a/src/debug.h
+++ b/src/debug.h
@@ -24,20 +24,6 @@
* along with MIaV; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
-
-/*
- * $Id$
- */
-
-/*
- * $Log$
- * Revision 1.4 2005/05/03 08:31:59 deva
- * Removed the error object, and replaced it with a more generic info object.
- *
- * Revision 1.3 2005/05/01 09:56:26 deva
- * Added Id and Log tags to all files
- */
-
#include <config.h>
#ifndef __MIAV_DEBUG_H__
#define __MIAV_DEBUG_H__
diff --git a/src/decoder.cc b/src/decoder.cc
index 5704347..26351fe 100644
--- a/src/decoder.cc
+++ b/src/decoder.cc
@@ -32,63 +32,6 @@
* along with MIaV; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
-
-/*
- * $Id$
- */
-
-/*
- * $Log$
- * Revision 1.33 2005/06/16 21:28:57 deva
- * Rewrote thread object
- * Fixed bug in mov_encoder (pushed read_sem too many times, whihc lead to
- * growing server queue)
- *
- * Revision 1.32 2005/06/09 11:00:03 deva
- * Added daemon code, and cleaned up using -Wall and -Werror
- *
- * Revision 1.31 2005/06/02 20:45:01 deva
- *
- * Added clear button
- * Optimized the frame handling a little (very little!).
- *
- * Revision 1.30 2005/06/02 15:03:23 deva
- *
- * Fixed crash in network.cc if socket not connected.
- * Added option to skop ecery second frame in player
- *
- * Revision 1.29 2005/05/25 13:11:42 deva
- *
- * Made unfreeze close connection, when no recording is done.
- *
- * Revision 1.28 2005/05/16 16:00:56 deva
- *
- * Lots of stuff!
- *
- * Revision 1.27 2005/05/03 08:31:59 deva
- * Removed the error object, and replaced it with a more generic info object.
- *
- * Revision 1.26 2005/05/02 14:06:55 deva
- * Added unfreeze to decoder (called from camera).
- *
- * Revision 1.25 2005/05/02 10:52:46 deva
- *
- * Fixed bug invoking infinite loop, when snapshot is requested.
- *
- * Revision 1.24 2005/05/02 10:35:23 deva
- * Fixed wrongly showed snapshot thumbnails.
- *
- * Revision 1.23 2005/05/02 09:58:43 deva
- *
- * Fixed initial values of the stae bools.
- *
- * Revision 1.22 2005/05/02 09:50:22 deva
- * Rewrote freeze, shoot and record flags, from encoder to frame.
- *
- * Revision 1.21 2005/05/01 09:56:26 deva
- * Added Id and Log tags to all files
- */
-
#include <config.h>
#ifdef USE_GUI
/*
diff --git a/src/decoder.h b/src/decoder.h
index 8606880..c436722 100644
--- a/src/decoder.h
+++ b/src/decoder.h
@@ -31,42 +31,6 @@
* along with MIaV; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
-
-/*
- * $Id$
- */
-
-/*
- * $Log$
- * Revision 1.15 2005/06/16 21:28:57 deva
- * Rewrote thread object
- * Fixed bug in mov_encoder (pushed read_sem too many times, whihc lead to
- * growing server queue)
- *
- * Revision 1.14 2005/05/25 13:11:42 deva
- *
- * Made unfreeze close connection, when no recording is done.
- *
- * Revision 1.13 2005/05/07 10:25:34 deva
- *
- * Removed ffmpeg code from img_encoder and corrected decoding errors in mov_encoder
- *
- * Revision 1.12 2005/05/03 08:31:59 deva
- * Removed the error object, and replaced it with a more generic info object.
- *
- * Revision 1.11 2005/05/02 14:06:55 deva
- * Added unfreeze to decoder (called from camera).
- *
- * Revision 1.10 2005/05/02 10:35:23 deva
- * Fixed wrongly showed snapshot thumbnails.
- *
- * Revision 1.9 2005/05/02 09:50:22 deva
- * Rewrote freeze, shoot and record flags, from encoder to frame.
- *
- * Revision 1.8 2005/05/01 09:56:26 deva
- * Added Id and Log tags to all files
- */
-
#include <config.h>
#ifdef USE_GUI
diff --git a/src/dv.h b/src/dv.h
index 5104d81..a5fad62 100644
--- a/src/dv.h
+++ b/src/dv.h
@@ -24,20 +24,6 @@
* along with MIaV; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
-
-/*
- * $Id$
- */
-
-/*
- * $Log$
- * Revision 1.3 2005/05/03 08:31:59 deva
- * Removed the error object, and replaced it with a more generic info object.
- *
- * Revision 1.2 2005/05/01 09:56:26 deva
- * Added Id and Log tags to all files
- */
-
#include <config.h>
#ifndef __MIAV_DV_H__
#define __MIAV_DV_H__
diff --git a/src/dv1394.cc b/src/dv1394.cc
index ed7b038..4a2d4f7 100644
--- a/src/dv1394.cc
+++ b/src/dv1394.cc
@@ -24,23 +24,6 @@
* along with MIaV; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
-
-/*
- * $Id$
- */
-
-/*
- * $Log$
- * Revision 1.8 2005/05/03 17:13:25 deva
- * Fixed some missong Info object references.
- *
- * Revision 1.7 2005/05/03 08:31:59 deva
- * Removed the error object, and replaced it with a more generic info object.
- *
- * Revision 1.6 2005/05/01 09:56:26 deva
- * Added Id and Log tags to all files
- */
-
#include <config.h>
#include "dv1394.h"
diff --git a/src/dv1394.h b/src/dv1394.h
index 2131dc9..023d9e6 100644
--- a/src/dv1394.h
+++ b/src/dv1394.h
@@ -24,23 +24,6 @@
* along with MIaV; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
-
-/*
- * $Id$
- */
-
-/*
- * $Log$
- * Revision 1.5 2005/05/03 17:13:25 deva
- * Fixed some missong Info object references.
- *
- * Revision 1.4 2005/05/03 08:31:59 deva
- * Removed the error object, and replaced it with a more generic info object.
- *
- * Revision 1.3 2005/05/01 09:56:26 deva
- * Added Id and Log tags to all files
- */
-
#include <config.h>
#ifndef __MIAV_DV1394_H__
#define __MIAV_DV1394_H__
diff --git a/src/encoder.cc b/src/encoder.cc
index 9bc6b56..208dd79 100644
--- a/src/encoder.cc
+++ b/src/encoder.cc
@@ -32,59 +32,6 @@
* along with MIaV; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
-
-/*
- * $Id$
- */
-
-/*
- * $Log$
- * Revision 1.29 2005/06/16 21:28:57 deva
- * Rewrote thread object
- * Fixed bug in mov_encoder (pushed read_sem too many times, whihc lead to
- * growing server queue)
- *
- * Revision 1.28 2005/05/25 13:11:42 deva
- *
- * Made unfreeze close connection, when no recording is done.
- *
- * Revision 1.27 2005/05/22 16:34:44 deva
- *
- * Fix: Connection is now taken down when taking a sanpshot without recording.
- *
- * Revision 1.26 2005/05/03 08:31:59 deva
- * Removed the error object, and replaced it with a more generic info object.
- *
- * Revision 1.25 2005/05/02 20:34:38 deva
- * Some hacked borky ugly scumm code to check for errors! :(
- *
- * Revision 1.24 2005/05/02 10:35:23 deva
- * Fixed wrongly showed snapshot thumbnails.
- *
- * Revision 1.23 2005/05/02 10:18:51 deva
- * Preserve network connection when a frozen frame exists, even though no recording is done.
- *
- * Revision 1.22 2005/05/02 10:01:58 deva
- * Create and destroy netowrk connections in main function and not in start/stop/freeze... etc
- *
- * Revision 1.21 2005/05/02 09:50:22 deva
- * Rewrote freeze, shoot and record flags, from encoder to frame.
- *
- * Revision 1.20 2005/05/02 09:18:13 deva
- *
- * Fixed decoding problem in snapshot thumbnails.
- *
- * Revision 1.19 2005/05/01 12:23:20 deva
- *
- * Now snapshot is read from frame queue.
- *
- * Revision 1.18 2005/05/01 11:25:56 deva
- * Added code to read screenshot from frame queue, decode it to rgb and put it into a qimage.
- *
- * Revision 1.17 2005/05/01 09:56:26 deva
- * Added Id and Log tags to all files
- */
-
#include <config.h>
#ifdef USE_GUI
diff --git a/src/encoder.h b/src/encoder.h
index 7eb1c87..b896d3d 100644
--- a/src/encoder.h
+++ b/src/encoder.h
@@ -31,37 +31,6 @@
* along with MIaV; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
-
-/*
- * $Id$
- */
-
-/*
- * $Log$
- * Revision 1.13 2005/06/16 21:28:57 deva
- * Rewrote thread object
- * Fixed bug in mov_encoder (pushed read_sem too many times, whihc lead to
- * growing server queue)
- *
- * Revision 1.12 2005/05/03 08:31:59 deva
- * Removed the error object, and replaced it with a more generic info object.
- *
- * Revision 1.11 2005/05/02 10:35:23 deva
- * Fixed wrongly showed snapshot thumbnails.
- *
- * Revision 1.10 2005/05/02 10:18:51 deva
- * Preserve network connection when a frozen frame exists, even though no recording is done.
- *
- * Revision 1.9 2005/05/02 09:50:22 deva
- * Rewrote freeze, shoot and record flags, from encoder to frame.
- *
- * Revision 1.8 2005/05/01 11:25:56 deva
- * Added code to read screenshot from frame queue, decode it to rgb and put it into a qimage.
- *
- * Revision 1.7 2005/05/01 09:56:26 deva
- * Added Id and Log tags to all files
- */
-
#include <config.h>
#ifdef USE_GUI
diff --git a/src/file.cc b/src/file.cc
index a9da5ba..50ed3f9 100644
--- a/src/file.cc
+++ b/src/file.cc
@@ -24,40 +24,6 @@
* along with MIaV; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
-
-/*
- * $Id$
- */
-
-/*
- * $Log$
- * Revision 1.7 2005/06/20 15:15:24 deva
- * *** empty log message ***
- *
- * Revision 1.6 2005/06/19 20:04:43 deva
- * ImgEncoder now uses the file class for output, through jpeg_mem_dest.
- *
- * Revision 1.5 2005/06/19 11:44:14 deva
- * Cleaned up a log of logging.
- * Fixed server queue (shouldn't happen).
- * Added user and group lookup.
- *
- * Revision 1.4 2005/06/14 18:58:35 deva
- * *** empty log message ***
- *
- * Revision 1.3 2005/06/14 12:29:40 deva
- * Incorporated the use of the Info object everywhere... also using the log functionality.
- *
- * Revision 1.2 2005/06/13 20:38:19 deva
- * Added some logfile code.
- * Enhanced the file object... now ready to hook into mov_encoder
- *
- * Revision 1.1 2005/06/09 17:54:00 deva
- * New file object, that takes care of uniqueness and counts up number in
- * filename, when grown too big.
- *
- */
-
#include <config.h>
#include "file.h"
diff --git a/src/file.h b/src/file.h
index 3faecb5..3832ba7 100644
--- a/src/file.h
+++ b/src/file.h
@@ -24,26 +24,6 @@
* along with MIaV; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
-
-/*
- * $Id$
- */
-
-/*
- * $Log$
- * Revision 1.3 2005/06/19 20:04:43 deva
- * ImgEncoder now uses the file class for output, through jpeg_mem_dest.
- *
- * Revision 1.2 2005/06/13 20:38:19 deva
- * Added some logfile code.
- * Enhanced the file object... now ready to hook into mov_encoder
- *
- * Revision 1.1 2005/06/09 17:54:00 deva
- * New file object, that takes care of uniqueness and counts up number in
- * filename, when grown too big.
- *
- */
-
#include <config.h>
#ifndef __MIAV_FILE_H__
#define __MIAV_FILE_H__
diff --git a/src/frame.cc b/src/frame.cc
index d723e02..cc53d62 100644
--- a/src/frame.cc
+++ b/src/frame.cc
@@ -24,36 +24,6 @@
* along with MIaV; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
-
-/*
- * $Id$
- */
-
-/*
- * $Log$
- * Revision 1.10 2005/07/22 15:59:39 deva
- * *** empty log message ***
- *
- * Revision 1.9 2005/06/16 21:28:57 deva
- * Rewrote thread object
- * Fixed bug in mov_encoder (pushed read_sem too many times, whihc lead to
- * growing server queue)
- *
- * Revision 1.8 2005/06/02 20:45:01 deva
- *
- * Added clear button
- * Optimized the frame handling a little (very little!).
- *
- * Revision 1.7 2005/05/22 15:49:22 deva
- * Added multithreaded encoding support.
- *
- * Revision 1.6 2005/05/03 08:31:59 deva
- * Removed the error object, and replaced it with a more generic info object.
- *
- * Revision 1.5 2005/05/01 09:56:26 deva
- * Added Id and Log tags to all files
- */
-
#include <config.h>
#include "frame.h"
diff --git a/src/frame.h b/src/frame.h
index fe67a62..f1b411a 100644
--- a/src/frame.h
+++ b/src/frame.h
@@ -24,38 +24,6 @@
* along with MIaV; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
-
-/*
- * $Id$
- */
-
-/*
- * $Log$
- * Revision 1.9 2005/07/22 15:59:39 deva
- * *** empty log message ***
- *
- * Revision 1.8 2005/06/16 21:28:57 deva
- * Rewrote thread object
- * Fixed bug in mov_encoder (pushed read_sem too many times, whihc lead to
- * growing server queue)
- *
- * Revision 1.7 2005/05/25 13:11:42 deva
- *
- * Made unfreeze close connection, when no recording is done.
- *
- * Revision 1.6 2005/05/22 15:49:22 deva
- * Added multithreaded encoding support.
- *
- * Revision 1.5 2005/05/03 08:31:59 deva
- * Removed the error object, and replaced it with a more generic info object.
- *
- * Revision 1.4 2005/05/02 09:50:22 deva
- * Rewrote freeze, shoot and record flags, from encoder to frame.
- *
- * Revision 1.3 2005/05/01 09:56:26 deva
- * Added Id and Log tags to all files
- */
-
#include <config.h>
#ifndef __FRAME_H__
#define __FRAME_H__
diff --git a/src/historywidget.cc b/src/historywidget.cc
index d213cd2..c517e7a 100644
--- a/src/historywidget.cc
+++ b/src/historywidget.cc
@@ -24,18 +24,6 @@
* along with MIaV; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
-
-/*
- * $Id$
- */
-
-/*
- * $Log$
- * Revision 1.1 2005/07/27 12:40:47 deva
- * *** empty log message ***
- *
- */
-
#include <config.h>
#include "historywidget.h"
diff --git a/src/historywidget.h b/src/historywidget.h
index d6f2c1f..7d7bad4 100644
--- a/src/historywidget.h
+++ b/src/historywidget.h
@@ -24,18 +24,6 @@
* along with MIaV; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
-
-/*
- * $Id$
- */
-
-/*
- * $Log$
- * Revision 1.1 2005/07/27 12:40:47 deva
- * *** empty log message ***
- *
- */
-
#include <config.h>
#ifndef __MIAV_HISTORYWIDGET_H__
#define __MIAV_HISTORYWIDGET_H__
diff --git a/src/img_encoder.cc b/src/img_encoder.cc
index aa2ee46..1e8f4a6 100644
--- a/src/img_encoder.cc
+++ b/src/img_encoder.cc
@@ -32,33 +32,6 @@
* along with MIaV; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
-
-/*
- * $Id$
- */
-
-/*
- * $Log$
- * Revision 1.11 2005/06/30 10:04:35 deva
- * *** empty log message ***
- *
- * Revision 1.10 2005/06/19 20:04:43 deva
- * ImgEncoder now uses the file class for output, through jpeg_mem_dest.
- *
- * Revision 1.9 2005/05/26 12:48:36 deva
- * *** empty log message ***
- *
- * Revision 1.8 2005/05/07 10:25:34 deva
- *
- * Removed ffmpeg code from img_encoder and corrected decoding errors in mov_encoder
- *
- * Revision 1.7 2005/05/03 08:31:59 deva
- * Removed the error object, and replaced it with a more generic info object.
- *
- * Revision 1.6 2005/05/01 09:56:26 deva
- * Added Id and Log tags to all files
- */
-
#include "img_encoder.h"
#include <stdio.h>
diff --git a/src/img_encoder.h b/src/img_encoder.h
index eb702b2..9df1e21 100644
--- a/src/img_encoder.h
+++ b/src/img_encoder.h
@@ -31,27 +31,6 @@
* along with MIaV; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
-
-/*
- * $Id$
- */
-
-/*
- * $Log$
- * Revision 1.8 2005/06/19 20:04:43 deva
- * ImgEncoder now uses the file class for output, through jpeg_mem_dest.
- *
- * Revision 1.7 2005/05/07 10:25:34 deva
- *
- * Removed ffmpeg code from img_encoder and corrected decoding errors in mov_encoder
- *
- * Revision 1.6 2005/05/03 08:31:59 deva
- * Removed the error object, and replaced it with a more generic info object.
- *
- * Revision 1.5 2005/05/01 09:56:26 deva
- * Added Id and Log tags to all files
- */
-
#ifndef __RTVIDEOREC_IMGENCODER_H
#define __RTVIDEOREC_IMGENCODER_H
diff --git a/src/info.cc b/src/info.cc
index effa887..701a705 100644
--- a/src/info.cc
+++ b/src/info.cc
@@ -24,25 +24,6 @@
* along with MIaV; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
-
-/*
- * $Id$
- */
-
-/*
- * $Log$
- * Revision 1.3 2005/06/14 13:47:09 deva
- * *** empty log message ***
- *
- * Revision 1.2 2005/06/14 12:29:40 deva
- * Incorporated the use of the Info object everywhere... also using the log functionality.
- *
- * Revision 1.1 2005/06/13 20:38:19 deva
- * Added some logfile code.
- * Enhanced the file object... now ready to hook into mov_encoder
- *
- */
-
#include <config.h>
#include "info.h"
diff --git a/src/info.h b/src/info.h
index 99e55b7..54838f6 100644
--- a/src/info.h
+++ b/src/info.h
@@ -24,15 +24,6 @@
* along with MIaV; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
-
-/*
- * $Id$
- */
-
-/*
- * $Log$
- */
-
#include <config.h>
#ifndef __MIAV_INFO_H__
#define __MIAV_INFO_H__
diff --git a/src/info_console.cc b/src/info_console.cc
index a860dd8..ce406fb 100644
--- a/src/info_console.cc
+++ b/src/info_console.cc
@@ -24,15 +24,6 @@
* along with MIaV; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
-
-/*
- * $Id$
- */
-
-/*
- * $Log$
- */
-
#include <config.h>
#include "info_console.h"
diff --git a/src/info_console.h b/src/info_console.h
index 1447071..836c1cd 100644
--- a/src/info_console.h
+++ b/src/info_console.h
@@ -24,15 +24,6 @@
* along with MIaV; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
-
-/*
- * $Id$
- */
-
-/*
- * $Log$
- */
-
#include <config.h>
#ifndef __MIAV_INFO_CONSOLE_H__
#define __MIAV_INFO_CONSOLE_H__
diff --git a/src/info_gui.cc b/src/info_gui.cc
index 0d7d701..aa831b6 100644
--- a/src/info_gui.cc
+++ b/src/info_gui.cc
@@ -24,15 +24,6 @@
* along with MIaV; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
-
-/*
- * $Id$
- */
-
-/*
- * $Log$
- */
-
#include <config.h>
#ifdef USE_GUI
diff --git a/src/info_gui.h b/src/info_gui.h
index 2ee3d63..6c3b303 100644
--- a/src/info_gui.h
+++ b/src/info_gui.h
@@ -24,15 +24,6 @@
* along with MIaV; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
-
-/*
- * $Id$
- */
-
-/*
- * $Log$
- */
-
#include <config.h>
#ifndef __MIAV_INFO_GUI_H__
#define __MIAV_INFO_GUI_H__
diff --git a/src/libfame_wrapper.cc b/src/libfame_wrapper.cc
index a7e52e3..e17ed68 100644
--- a/src/libfame_wrapper.cc
+++ b/src/libfame_wrapper.cc
@@ -24,25 +24,6 @@
* along with MIaV; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
-
-/*
- * $Id$
- */
-
-/*
- * $Log$
- * Revision 1.3 2005/07/22 15:59:39 deva
- * *** empty log message ***
- *
- * Revision 1.2 2005/07/05 23:15:16 deva
- * *** empty log message ***
- *
- * Revision 1.1 2005/07/02 11:39:51 deva
- * Added some audiocode.
- * Moved libfame code out of mov_encoder
- *
- */
-
#include <config.h>
#include "libfame_wrapper.h"
diff --git a/src/libfame_wrapper.h b/src/libfame_wrapper.h
index 9f3e0e8..68664e5 100644
--- a/src/libfame_wrapper.h
+++ b/src/libfame_wrapper.h
@@ -24,19 +24,6 @@
* along with MIaV; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
-
-/*
- * $Id$
- */
-
-/*
- * $Log$
- * Revision 1.1 2005/07/02 11:39:51 deva
- * Added some audiocode.
- * Moved libfame code out of mov_encoder
- *
- */
-
#include <config.h>
#ifndef __MIAV_LIBFAME_WRAPPER_H__
#define __MIAV_LIBFAME_WRAPPER_H__
diff --git a/src/liblame_wrapper.cc b/src/liblame_wrapper.cc
index f204214..5868c86 100644
--- a/src/liblame_wrapper.cc
+++ b/src/liblame_wrapper.cc
@@ -24,31 +24,6 @@
* along with MIaV; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
-
-/*
- * $Id$
- */
-
-/*
- * $Log$
- * Revision 1.5 2005/07/22 15:59:39 deva
- * *** empty log message ***
- *
- * Revision 1.4 2005/07/09 16:23:15 deva
- * Added audio.
- *
- * Revision 1.3 2005/07/07 12:42:19 deva
- * *** empty log message ***
- *
- * Revision 1.2 2005/07/05 23:15:16 deva
- * *** empty log message ***
- *
- * Revision 1.1 2005/07/02 11:39:51 deva
- * Added some audiocode.
- * Moved libfame code out of mov_encoder
- *
- */
-
#include <config.h>
#include "liblame_wrapper.h"
#include "miav_config.h"
diff --git a/src/liblame_wrapper.h b/src/liblame_wrapper.h
index 1044abd..fd1d690 100644
--- a/src/liblame_wrapper.h
+++ b/src/liblame_wrapper.h
@@ -24,28 +24,6 @@
* along with MIaV; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
-
-/*
- * $Id$
- */
-
-/*
- * $Log$
- * Revision 1.4 2005/07/22 15:59:39 deva
- * *** empty log message ***
- *
- * Revision 1.3 2005/07/07 12:42:19 deva
- * *** empty log message ***
- *
- * Revision 1.2 2005/07/05 23:15:16 deva
- * *** empty log message ***
- *
- * Revision 1.1 2005/07/02 11:39:51 deva
- * Added some audiocode.
- * Moved libfame code out of mov_encoder
- *
- */
-
#include <config.h>
#ifndef __MIAV_LIBLAME_WRAPPER_H__
#define __MIAV_LIBLAME_WRAPPER_H__
diff --git a/src/mainwindow.cc b/src/mainwindow.cc
index 6e9f77b..136f5c5 100644
--- a/src/mainwindow.cc
+++ b/src/mainwindow.cc
@@ -24,100 +24,6 @@
* along with MIaV; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
-
-/*
- * $Id$
- */
-
-/*
- * $Log$
- * Revision 1.44 2005/07/27 12:47:56 deva
- * CVS: ----------------------------------------------------------------------
- *
- * Revision 1.43 2005/07/27 12:40:47 deva
- * *** empty log message ***
- *
- * Revision 1.42 2005/07/25 15:56:27 deva
- * *** empty log message ***
- *
- * Revision 1.41 2005/07/25 15:35:41 deva
- * *** empty log message ***
- *
- * Revision 1.40 2005/07/25 14:27:14 deva
- * *** empty log message ***
- *
- * Revision 1.39 2005/07/25 12:42:13 deva
- * *** empty log message ***
- *
- * Revision 1.38 2005/07/23 10:22:12 deva
- * *** empty log message ***
- *
- * Revision 1.35 2005/07/22 19:20:28 deva
- * *** empty log message ***
- *
- * Revision 1.34 2005/06/19 11:44:14 deva
- * Cleaned up a log of logging.
- * Fixed server queue (shouldn't happen).
- * Added user and group lookup.
- *
- * Revision 1.33 2005/06/16 21:28:57 deva
- * Rewrote thread object
- * Fixed bug in mov_encoder (pushed read_sem too many times, whihc lead to
- * growing server queue)
- *
- * Revision 1.32 2005/06/15 08:41:49 deva
- * *** empty log message ***
- *
- * Revision 1.31 2005/06/15 08:34:28 deva
- * *** empty log message ***
- *
- * Revision 1.30 2005/06/15 08:28:58 deva
- * Added logging to mainwindow, removed newline in log entry from file
- *
- * Revision 1.29 2005/06/14 12:29:40 deva
- * Incorporated the use of the Info object everywhere... also using the log functionality.
- *
- * Revision 1.28 2005/06/02 20:45:01 deva
- *
- * Added clear button
- * Optimized the frame handling a little (very little!).
- *
- * Revision 1.27 2005/05/23 19:30:36 deva
- * Made some cleanup in the status bar.
- *
- * Revision 1.26 2005/05/16 16:00:56 deva
- * Lots of stuff!
- *
- * Revision 1.25 2005/05/03 09:22:12 deva
- * Implemented the gui part of the info object.
- *
- * Revision 1.24 2005/05/03 08:31:59 deva
- * Removed the error object, and replaced it with a more generic info object.
- *
- * Revision 1.23 2005/05/02 20:34:38 deva
- * Some hacked borky ugly scumm code to check for errors! :(
- *
- * Revision 1.22 2005/05/02 19:56:17 deva
- * cpr_clicked is now blocked, if a recording session on. A messagebox explains
- * how to stop before trying to change the cpr number again.
- *
- * Revision 1.21 2005/05/02 18:47:21 deva
- * Cpr now sent to decoder. And saved prioer to editing, in order to be able
- * to disable editing session and revert to old cpr.
- *
- * Revision 1.19 2005/05/01 12:13:50 deva
- * Removed bitmap readin.
- *
- * Revision 1.18 2005/05/01 12:04:15 deva
- * Using qbitmap for raw pixel readin.
- *
- * Revision 1.17 2005/05/01 11:25:56 deva
- * Added code to read screenshot from frame queue, decode it to rgb and put it into a qimage.
- *
- * Revision 1.16 2005/05/01 09:56:26 deva
- * Added Id and Log tags to all files
- */
-
#include <config.h>
#ifdef USE_GUI
@@ -175,7 +81,7 @@ MainWindow::MainWindow(QApplication *qApp, QWidget* parent, const char* name )
img_cpr = loadButtonIcon( PIXMAP_CPR );
img_clear = loadButtonIcon( PIXMAP_CLEAR );
img_snapshot = loadButtonIcon( PIXMAP_SNAPSHOT );
- // img_logo = loadButtonIcon( PIXMAP_LOGO_SMALL );
+ img_logo = loadButtonIcon( PIXMAP_LOGO_SMALL, 1 );
img_dummy = loadImage( PIXMAP_DUMMY );
@@ -218,7 +124,7 @@ MainWindow::~MainWindow()
info->log("MIaV is shut down.");
}
-QImage *MainWindow::loadButtonIcon( char *name )
+QImage *MainWindow::loadButtonIcon( char *name, int height )
{
QImage scaled;
@@ -227,7 +133,7 @@ QImage *MainWindow::loadButtonIcon( char *name )
img = new QImage();
img->load( name );
- int h = (int)(BUTTON_HEIGHT * unit);
+ int h = (int)(height * unit);
int w = (int)((float)img->width() / (float)(img->height() / (float)h));
scaled = img->smoothScale(w, h);
@@ -372,6 +278,14 @@ void MainWindow::createGui()
g0->margin() * 2);
status->addWidget(lbl_recordtime, 0, TRUE);
+ // About button
+ btn_about = new QPushButton("", this);
+ btn_about->setFixedHeight((int)unit);
+ btn_about->setPixmap(*img_logo);
+ QObject::connect( btn_about, SIGNAL(clicked()), this, SLOT(about_clicked()) );
+ status->addWidget(btn_about, 0, TRUE);
+
+ // Version label
lbl_version = createLabel("MIaV-Grab v" VERSION, BUTTON_WIDTH, 1);
lbl_version->setFixedWidth((int)(BUTTON_WIDTH * unit) +
(gb->insideMargin() * 2) +
@@ -382,6 +296,32 @@ void MainWindow::createGui()
status->message( TXT_READY );
}
+
+QPushButton *MainWindow::createButton(char *caption, int width, int height)
+{
+ return createButton(caption, this, width, height);
+}
+
+
+QPushButton *MainWindow::createButton(char *caption, QWidget *parent, int width, int height)
+{
+ QPushButton *btn = new QPushButton(caption, parent);
+ btn->setFont( QFont( "Sans Serif", (int)(unit * height / 2), QFont::Bold ) );
+ btn->setFixedHeight((int)(unit * height));
+ return btn;
+}
+
+
+QLabel *MainWindow::createLabel(char *caption, int width, int height)
+{
+ QLabel *lbl = new QLabel(caption, this);
+ lbl->setFont( QFont( "Sans Serif",
+ (height>1)?(int)(unit * height / 2):(int)(unit * height / 3),
+ (height>1)?QFont::Bold:QFont::Normal ) );
+ lbl->setFixedHeight((int)(unit * height));
+ return lbl;
+}
+
#include <sys/time.h>
static struct timeval starttime;
static int h = 0;
@@ -429,29 +369,6 @@ void MainWindow::redraw_edge()
(int) (GREY - (GREY * val))));
}
-QPushButton *MainWindow::createButton(char *caption, int width, int height)
-{
- return createButton(caption, this, width, height);
-}
-
-QPushButton *MainWindow::createButton(char *caption, QWidget *parent, int width, int height)
-{
- QPushButton *btn = new QPushButton(caption, parent);
- btn->setFont( QFont( "Sans Serif", (int)(unit * height / 2), QFont::Bold ) );
- btn->setFixedHeight((int)(unit * height));
- return btn;
-}
-
-QLabel *MainWindow::createLabel(char *caption, int width, int height)
-{
- QLabel *lbl = new QLabel(caption, this);
- lbl->setFont( QFont( "Sans Serif",
- (height>1)?(int)(unit * height / 2):(int)(unit * height / 3),
- (height>1)?QFont::Bold:QFont::Normal ) );
- lbl->setFixedHeight((int)(unit * height));
- return lbl;
-}
-
void MainWindow::message(char *msg)
{
status->message(msg);
@@ -472,9 +389,11 @@ void MainWindow::clear()
lbl_cpr->setText("");
}
-void MainWindow::live_clicked()
+#include "aboutwindow.h"
+void MainWindow::about_clicked()
{
- info->info("live_clicked");
+ AboutWindow about;
+ about.exec();
}
void MainWindow::clear_clicked()
diff --git a/src/mainwindow.h b/src/mainwindow.h
index 0443d13..2d3adb5 100644
--- a/src/mainwindow.h
+++ b/src/mainwindow.h
@@ -24,61 +24,6 @@
* along with MIaV; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
-
-/*
- * $Id$
- */
-
-/*
- * $Log$
- * Revision 1.21 2005/07/27 12:40:47 deva
- * *** empty log message ***
- *
- * Revision 1.20 2005/07/25 14:27:14 deva
- * *** empty log message ***
- *
- * Revision 1.19 2005/07/23 10:11:45 deva
- * *** empty log message ***
- *
- * Revision 1.17 2005/07/22 19:20:28 deva
- * *** empty log message ***
- *
- * Revision 1.16 2005/06/16 21:28:57 deva
- * Rewrote thread object
- * Fixed bug in mov_encoder (pushed read_sem too many times, whihc lead to
- * growing server queue)
- *
- * Revision 1.15 2005/06/02 20:45:01 deva
- *
- * Added clear button
- * Optimized the frame handling a little (very little!).
- *
- * Revision 1.14 2005/05/23 19:30:36 deva
- * Made some cleanup in the status bar.
- *
- * Revision 1.13 2005/05/16 16:00:57 deva
- *
- * Lots of stuff!
- *
- * Revision 1.12 2005/05/03 09:22:12 deva
- * Implemented the gui part of the info object.
- *
- * Revision 1.11 2005/05/03 08:31:59 deva
- * Removed the error object, and replaced it with a more generic info object.
- *
- * Revision 1.10 2005/05/02 20:34:38 deva
- *
- * Some hacked borky ugly scumm code to check for errors! :(
- *
- * Revision 1.9 2005/05/02 19:56:17 deva
- *
- * cpr_clicked is now blocked, if a recording session on. A messagebox explains
- * how to stop before trying to change the cpr number again.
- *
- * Revision 1.8 2005/05/01 09:56:26 deva
- * Added Id and Log tags to all files
- */
-
#include <config.h>
#ifdef USE_GUI
@@ -143,7 +88,7 @@ Optagelsen standses ved tryk på den røde cirkel med gul streg over."
#define PIXMAP_SNAPSHOT PIXMAPS"/snapshot.png"
#define PIXMAP_DUMMY PIXMAPS"/dummy.png"
-#define PIXMAP_LOGO_SMALL PIXMAPS"/miav_small.png"
+#define PIXMAP_LOGO_SMALL PIXMAPS"/miav-logo.png"
class MainWindow : public QWidget
{
@@ -162,7 +107,7 @@ public slots:
void freeze_clicked();
void redraw_edge();
void taskbar_update();
- void live_clicked();
+ void about_clicked();
private:
void clear();
@@ -175,7 +120,7 @@ private:
Info *cam_info;
// Image loading routines.
- QImage *loadButtonIcon( char *name );
+ QImage *loadButtonIcon( char *name, int height = BUTTON_HEIGHT );
QImage *loadImage( char *name );
QImage *img_unfreeze;
@@ -211,6 +156,8 @@ private:
QPushButton *btn_shoot;
QPushButton *btn_freeze;
+ QPushButton *btn_about;
+
QStatusBar *status;
VideoWidget *img_live;
diff --git a/src/messagebox.cc b/src/messagebox.cc
index 0f4b803..df0e813 100644
--- a/src/messagebox.cc
+++ b/src/messagebox.cc
@@ -24,23 +24,6 @@
* along with MIaV; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
-
-/*
- * $Id$
- */
-
-/*
- * $Log$
- * Revision 1.9 2005/05/03 08:31:59 deva
- * Removed the error object, and replaced it with a more generic info object.
- *
- * Revision 1.8 2005/05/01 16:45:48 deva
- * Icons added to messagebox.
- *
- * Revision 1.7 2005/05/01 09:56:26 deva
- * Added Id and Log tags to all files
- *
- */
#include <config.h>
#ifdef USE_GUI
#include "messagebox.h"
@@ -148,8 +131,8 @@ MessageBox::MessageBox(QWidget* parent,
}
case TYPE_YES_NO:
{
- QPushButton *byes = createButton(f, TXT_YES );
QPushButton *bno = createButton(f, TXT_NO );
+ QPushButton *byes = createButton(f, TXT_YES );
QGridLayout *glayout = new QGridLayout(f, 1, 2, 20, 20);
glayout->addWidget(bno, 0, 0);
glayout->addWidget(byes, 0, 1);
@@ -159,9 +142,9 @@ MessageBox::MessageBox(QWidget* parent,
}
case TYPE_YES_NO_MAYBE:
{
- QPushButton *byes = createButton(f, TXT_YES );
- QPushButton *bno = createButton(f, TXT_NO );
QPushButton *bmaybe = createButton(f, TXT_MAYBE );
+ QPushButton *bno = createButton(f, TXT_NO );
+ QPushButton *byes = createButton(f, TXT_YES );
QGridLayout *glayout = new QGridLayout(f, 1, 3, 20, 20);
glayout->addWidget(bno, 0, 0);
glayout->addWidget(byes, 0, 1);
@@ -173,9 +156,9 @@ MessageBox::MessageBox(QWidget* parent,
}
case TYPE_YES_NO_CANCEL:
{
- QPushButton *byes = createButton(f, TXT_YES );
QPushButton *bcancel = createButton(f, TXT_CANCEL );
QPushButton *bno = createButton(f, TXT_NO );
+ QPushButton *byes = createButton(f, TXT_YES );
QGridLayout *glayout = new QGridLayout(f, 1, 3, 20, 20);
glayout->addWidget(bno, 0, 0);
glayout->addWidget(bcancel, 0, 1);
@@ -187,10 +170,10 @@ MessageBox::MessageBox(QWidget* parent,
}
case TYPE_YES_NO_MAYBE_CANCEL:
{
- QPushButton *byes = createButton(f, TXT_YES );
+ QPushButton *bmaybe = createButton(f, TXT_MAYBE );
QPushButton *bcancel = createButton(f, TXT_CANCEL );
QPushButton *bno = createButton(f, TXT_NO );
- QPushButton *bmaybe = createButton(f, TXT_MAYBE );
+ QPushButton *byes = createButton(f, TXT_YES );
QGridLayout *glayout = new QGridLayout(f, 1, 4, 20, 20);
glayout->addWidget(bno, 0, 0);
glayout->addWidget(bcancel, 0, 1);
diff --git a/src/messagebox.h b/src/messagebox.h
index d7aee03..189b926 100644
--- a/src/messagebox.h
+++ b/src/messagebox.h
@@ -24,21 +24,6 @@
* along with MIaV; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
-
-/*
- * $Id$
- */
-
-/*
- * $Log$
- * Revision 1.7 2005/05/03 08:31:59 deva
- * Removed the error object, and replaced it with a more generic info object.
- *
- * Revision 1.6 2005/05/01 09:56:26 deva
- * Added Id and Log tags to all files
- *
- */
-
#include <config.h>
#ifdef USE_GUI
diff --git a/src/miav.cc b/src/miav.cc
index 9dc3552..dbb8b28 100644
--- a/src/miav.cc
+++ b/src/miav.cc
@@ -24,51 +24,6 @@
* along with MIaV; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
-
-/*
- * $Id$
- */
-
-/*
- * $Log$
- * Revision 1.15 2005/06/19 11:44:14 deva
- * Cleaned up a log of logging.
- * Fixed server queue (shouldn't happen).
- * Added user and group lookup.
- *
- * Revision 1.14 2005/06/14 12:29:40 deva
- * Incorporated the use of the Info object everywhere... also using the log functionality.
- *
- * Revision 1.13 2005/06/09 11:00:03 deva
- * Added daemon code, and cleaned up using -Wall and -Werror
- *
- * Revision 1.12 2005/05/25 12:31:59 deva
- *
- * Made info (error message system) work correctly.
- *
- * Revision 1.11 2005/05/23 18:42:50 deva
- * Error message windows is now modal with mainwindow as its parent.
- *
- * Revision 1.10 2005/05/22 15:49:22 deva
- * Added multithreaded encoding support.
- *
- * Revision 1.9 2005/05/03 17:13:25 deva
- * Fixed some missong Info object references.
- *
- * Revision 1.8 2005/05/03 09:22:12 deva
- * Implemented the gui part of the info object.
- *
- * Revision 1.7 2005/05/03 08:31:59 deva
- * Removed the error object, and replaced it with a more generic info object.
- *
- * Revision 1.6 2005/05/02 19:47:43 deva
- * Fixed overlapping cpr numbers on the server (now it saves one cpr pr.
- * connection, and ignores any changes sent)
- *
- * Revision 1.5 2005/05/01 09:56:26 deva
- * Added Id and Log tags to all files
- */
-
#include <config.h>
#ifdef USE_GUI
diff --git a/src/miav.h b/src/miav.h
index fe191a0..6c6b8bf 100644
--- a/src/miav.h
+++ b/src/miav.h
@@ -24,20 +24,6 @@
* along with MIaV; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
-
-/*
- * $Id$
- */
-
-/*
- * $Log$
- * Revision 1.3 2005/05/03 08:31:59 deva
- * Removed the error object, and replaced it with a more generic info object.
- *
- * Revision 1.2 2005/05/01 09:56:26 deva
- * Added Id and Log tags to all files
- */
-
#include <config.h>
#ifndef __LIBMIAV_H__
#define __LIBMIAV_H__
diff --git a/src/miav_config.cc b/src/miav_config.cc
index 98b75bf..adfa5c5 100644
--- a/src/miav_config.cc
+++ b/src/miav_config.cc
@@ -24,33 +24,6 @@
* along with MIaV; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
-
-/*
- * $Id$
- */
-
-/*
- * $Log$
- * Revision 1.12 2005/07/22 15:56:31 deva
- * Variable names can now contain numbers.
- *
- * Revision 1.11 2005/07/02 11:39:51 deva
- * Added some audiocode.
- * Moved libfame code out of mov_encoder
- *
- * Revision 1.10 2005/06/14 12:29:40 deva
- * Incorporated the use of the Info object everywhere... also using the log functionality.
- *
- * Revision 1.9 2005/06/09 11:00:03 deva
- * Added daemon code, and cleaned up using -Wall and -Werror
- *
- * Revision 1.8 2005/05/03 08:31:59 deva
- * Removed the error object, and replaced it with a more generic info object.
- *
- * Revision 1.7 2005/05/01 09:56:26 deva
- * Added Id and Log tags to all files
- */
-
#include <config.h>
#include "miav_config.h"
diff --git a/src/miav_config.h b/src/miav_config.h
index a4c432a..65f4480 100644
--- a/src/miav_config.h
+++ b/src/miav_config.h
@@ -24,27 +24,6 @@
* along with MIaV; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
-
-/*
- * $Id$
- */
-
-/*
- * $Log$
- * Revision 1.8 2005/07/02 11:39:51 deva
- * Added some audiocode.
- * Moved libfame code out of mov_encoder
- *
- * Revision 1.7 2005/06/14 12:29:40 deva
- * Incorporated the use of the Info object everywhere... also using the log functionality.
- *
- * Revision 1.6 2005/05/03 08:31:59 deva
- * Removed the error object, and replaced it with a more generic info object.
- *
- * Revision 1.5 2005/05/01 09:56:26 deva
- * Added Id and Log tags to all files
- */
-
#include <config.h>
#ifndef __MIAV_MIAV_CONFIG_H__
#define __MIAV_MIAV_CONFIG_H__
diff --git a/src/miav_daemon.cc b/src/miav_daemon.cc
index b164e92..500e92a 100644
--- a/src/miav_daemon.cc
+++ b/src/miav_daemon.cc
@@ -24,31 +24,6 @@
* along with MIaV; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
-
-/*
- * $Id$
- */
-
-/*
- * $Log$
- * Revision 1.5 2005/06/19 11:44:14 deva
- * Cleaned up a log of logging.
- * Fixed server queue (shouldn't happen).
- * Added user and group lookup.
- *
- * Revision 1.4 2005/06/16 21:28:57 deva
- * Rewrote thread object
- * Fixed bug in mov_encoder (pushed read_sem too many times, whihc lead to
- * growing server queue)
- *
- * Revision 1.3 2005/06/14 13:47:09 deva
- * *** empty log message ***
- *
- * Revision 1.1 2005/06/09 11:00:03 deva
- * Added daemon code, and cleaned up using -Wall and -Werror
- *
- */
-
#include <config.h>
#include "miav_daemon.h"
diff --git a/src/miav_daemon.h b/src/miav_daemon.h
index 91430f1..5cedad7 100644
--- a/src/miav_daemon.h
+++ b/src/miav_daemon.h
@@ -24,18 +24,6 @@
* along with MIaV; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
-
-/*
- * $Id$
- */
-
-/*
- * $Log$
- * Revision 1.1 2005/06/09 11:00:03 deva
- * Added daemon code, and cleaned up using -Wall and -Werror
- *
- */
-
#include <config.h>
#ifndef __MIAV_MIAV_DAEMON_H__
#define __MIAV_MIAV_DAEMON_H__
diff --git a/src/mov_encoder.cc b/src/mov_encoder.cc
index 74f9b90..1073b35 100644
--- a/src/mov_encoder.cc
+++ b/src/mov_encoder.cc
@@ -32,108 +32,6 @@
* along with MIaV; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
-
-/*
- * $Id$
- */
-
-/*
- * $Log$
- * Revision 1.36 2005/07/22 15:59:39 deva
- * *** empty log message ***
- *
- * Revision 1.35 2005/07/07 12:42:19 deva
- * *** empty log message ***
- *
- * Revision 1.34 2005/07/05 23:15:16 deva
- * *** empty log message ***
- *
- * Revision 1.33 2005/07/02 11:39:52 deva
- * Added some audiocode.
- * Moved libfame code out of mov_encoder
- *
- * Revision 1.32 2005/06/19 20:04:43 deva
- * ImgEncoder now uses the file class for output, through jpeg_mem_dest.
- *
- * Revision 1.31 2005/06/19 11:44:14 deva
- * Cleaned up a log of logging.
- * Fixed server queue (shouldn't happen).
- * Added user and group lookup.
- *
- * Revision 1.30 2005/06/16 21:28:57 deva
- * Rewrote thread object
- * Fixed bug in mov_encoder (pushed read_sem too many times, whihc lead to
- * growing server queue)
- *
- * Revision 1.29 2005/06/14 18:58:35 deva
- * *** empty log message ***
- *
- * Revision 1.28 2005/06/14 12:29:40 deva
- * Incorporated the use of the Info object everywhere... also using the log functionality.
- *
- * Revision 1.27 2005/06/09 11:00:03 deva
- * Added daemon code, and cleaned up using -Wall and -Werror
- *
- * Revision 1.26 2005/05/26 12:48:36 deva
- * *** empty log message ***
- *
- * Revision 1.25 2005/05/25 15:36:05 deva
- * Added mpeg4 encoding to the encoders, controllable by the config file.
- *
- * Revision 1.24 2005/05/22 15:49:22 deva
- * Added multithreaded encoding support.
- *
- * Revision 1.23 2005/05/19 14:10:22 deva
- * Multithreading rulez?
- *
- * Revision 1.22 2005/05/17 19:16:26 deva
- * Made new mpeg writer work, with proper file permissions.
- *
- * Revision 1.21 2005/05/17 14:30:56 deva
- * Added code, preparing threaded encoding.
- *
- * Revision 1.20 2005/05/16 16:00:57 deva
- * Lots of stuff!
- *
- * Revision 1.19 2005/05/16 13:25:52 deva
- * Moved video setting to configuration file.
- * Fine tuned setting for 2.4ghz server
- *
- * Revision 1.18 2005/05/16 11:13:24 deva
- * Optimized some encoding parameters.
- *
- * Revision 1.17 2005/05/16 10:45:10 deva
- * Added new entries to fame parameter struct (bitrate omongst other things)
- *
- * Revision 1.16 2005/05/09 19:54:15 deva
- * *** empty log message ***
- *
- * Revision 1.15 2005/05/09 16:40:20 deva
- * Added optimize yuv conversion code
- *
- * Revision 1.14 2005/05/07 10:56:18 deva
- * Changed print outs
- *
- * Revision 1.13 2005/05/07 10:25:34 deva
- * Removed ffmpeg code from img_encoder and corrected decoding errors in mov_encoder
- *
- * Revision 1.12 2005/05/05 20:41:38 deva
- * Removed the last pieces of ffmpeg... replaced it with libfame...
- * Not quite working yet, but all the major code is in place!
- *
- * Revision 1.11 2005/05/03 17:12:53 deva
- * Fixed a bug (forgot to set the frametime).
- *
- * Revision 1.10 2005/05/03 08:31:59 deva
- * Removed the error object, and replaced it with a more generic info object.
- *
- * Revision 1.9 2005/05/02 10:59:44 deva
- * Reverted to mpg file format (accidentally used avi with mpeg2)
- *
- * Revision 1.8 2005/05/01 09:56:26 deva
- * Added Id and Log tags to all files
- */
-
#include "mov_encoder.h"
#include <errno.h>
diff --git a/src/mov_encoder.h b/src/mov_encoder.h
index 1be2ac5..3442c77 100644
--- a/src/mov_encoder.h
+++ b/src/mov_encoder.h
@@ -33,50 +33,6 @@
/*
* $Id$
*/
-
-/*
- * $Log$
- * Revision 1.15 2005/07/05 23:15:16 deva
- * *** empty log message ***
- *
- * Revision 1.14 2005/07/02 11:39:52 deva
- * Added some audiocode.
- * Moved libfame code out of mov_encoder
- *
- * Revision 1.13 2005/06/16 21:54:22 deva
- * *** empty log message ***
- *
- * Revision 1.12 2005/06/16 21:28:57 deva
- * Rewrote thread object
- * Fixed bug in mov_encoder (pushed read_sem too many times, whihc lead to
- * growing server queue)
- *
- * Revision 1.11 2005/06/14 12:29:40 deva
- * Incorporated the use of the Info object everywhere... also using the log functionality.
- *
- * Revision 1.10 2005/05/22 15:49:22 deva
- * Added multithreaded encoding support.
- *
- * Revision 1.9 2005/05/19 14:10:22 deva
- * Multithreading rulez?
- *
- * Revision 1.8 2005/05/17 14:30:56 deva
- * Added code, preparing threaded encoding.
- *
- * Revision 1.7 2005/05/09 16:40:20 deva
- * Added optimize yuv conversion code
- *
- * Revision 1.6 2005/05/05 20:41:38 deva
- * Removed the last pieces of ffmpeg... replaced it with libfame...
- * Not quite working yet, but all the major code is in place!
- *
- * Revision 1.5 2005/05/03 08:31:59 deva
- * Removed the error object, and replaced it with a more generic info object.
- *
- * Revision 1.4 2005/05/01 09:56:26 deva
- * Added Id and Log tags to all files
- */
-
#ifndef __RTVIDEOREC_ENCODER_H
#define __RTVIDEOREC_ENCODER_H
diff --git a/src/mov_encoder_thread.cc b/src/mov_encoder_thread.cc
index d24e3f3..cfa6071 100644
--- a/src/mov_encoder_thread.cc
+++ b/src/mov_encoder_thread.cc
@@ -24,56 +24,6 @@
* along with MIaV; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
-
-/*
- * $Id$
- */
-
-/*
- * $Log$
- * Revision 1.13 2005/07/02 11:39:52 deva
- * Added some audiocode.
- * Moved libfame code out of mov_encoder
- *
- * Revision 1.12 2005/06/16 21:28:57 deva
- * Rewrote thread object
- * Fixed bug in mov_encoder (pushed read_sem too many times, whihc lead to
- * growing server queue)
- *
- * Revision 1.11 2005/06/14 18:58:35 deva
- * *** empty log message ***
- *
- * Revision 1.10 2005/06/14 12:29:40 deva
- * Incorporated the use of the Info object everywhere... also using the log functionality.
- *
- * Revision 1.9 2005/05/26 12:48:36 deva
- * *** empty log message ***
- *
- * Revision 1.8 2005/05/23 17:59:49 deva
- * Fixed delete of NULL input queue
- *
- * Revision 1.7 2005/05/22 15:49:22 deva
- * Added multithreaded encoding support.
- *
- * Revision 1.6 2005/05/19 14:10:22 deva
- * Multithreading rulez?
- *
- * Revision 1.5 2005/05/19 10:55:49 deva
- * Test for block encoding of length strlen("IPIPP").
- *
- * Revision 1.4 2005/05/17 19:16:26 deva
- * Made new mpeg writer work, with proper file permissions.
- *
- * Revision 1.3 2005/05/17 15:13:15 deva
- * *** empty log message ***
- *
- * Revision 1.2 2005/05/17 15:12:51 deva
- * Fixed file rights (All read on files and directories, and all execute on directories).
- *
- * Revision 1.1 2005/05/17 14:30:56 deva
- * Added code, preparing threaded encoding.
- */
-
#include <config.h>
#include "mov_encoder_thread.h"
#include <errno.h>
diff --git a/src/mov_encoder_thread.h b/src/mov_encoder_thread.h
index a4d334d..dfeba67 100644
--- a/src/mov_encoder_thread.h
+++ b/src/mov_encoder_thread.h
@@ -24,42 +24,6 @@
* along with MIaV; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
-
-/*
- * $Id$
- */
-
-/*
- * $Log$
- * Revision 1.8 2005/06/16 21:28:57 deva
- * Rewrote thread object
- * Fixed bug in mov_encoder (pushed read_sem too many times, whihc lead to
- * growing server queue)
- *
- * Revision 1.7 2005/06/14 12:29:40 deva
- * Incorporated the use of the Info object everywhere... also using the log functionality.
- *
- * Revision 1.6 2005/06/09 11:00:03 deva
- * Added daemon code, and cleaned up using -Wall and -Werror
- *
- * Revision 1.5 2005/05/22 15:49:22 deva
- * Added multithreaded encoding support.
- *
- * Revision 1.4 2005/05/19 14:10:22 deva
- *
- * Multithreading rulez?
- *
- * Revision 1.3 2005/05/19 10:55:49 deva
- * Test for block encoding of length strlen("IPIPP").
- *
- * Revision 1.2 2005/05/17 15:12:51 deva
- * Fixed file rights (All read on files and directories, and all execute on directories).
- *
- * Revision 1.1 2005/05/17 14:30:56 deva
- * Added code, preparing threaded encoding.
- *
- */
-
#include <config.h>
#ifndef __MIAV_MOV_ENCODER_THREAD_H__
#define __MIAV_MOV_ENCODER_THREAD_H__
diff --git a/src/mov_encoder_writer.cc b/src/mov_encoder_writer.cc
index 98e5ece..f408417 100644
--- a/src/mov_encoder_writer.cc
+++ b/src/mov_encoder_writer.cc
@@ -24,52 +24,6 @@
* along with MIaV; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
-
-/*
- * $Id$
- */
-
-/*
- * $Log$
- * Revision 1.12 2005/07/22 15:59:39 deva
- * *** empty log message ***
- *
- * Revision 1.11 2005/07/09 16:23:15 deva
- * Added audio.
- *
- * Revision 1.10 2005/07/07 12:42:19 deva
- * *** empty log message ***
- *
- * Revision 1.9 2005/07/05 23:15:16 deva
- * *** empty log message ***
- *
- * Revision 1.8 2005/06/30 10:04:35 deva
- * *** empty log message ***
- *
- * Revision 1.7 2005/06/19 20:04:43 deva
- * ImgEncoder now uses the file class for output, through jpeg_mem_dest.
- *
- * Revision 1.6 2005/06/16 21:28:57 deva
- * Rewrote thread object
- * Fixed bug in mov_encoder (pushed read_sem too many times, whihc lead to
- * growing server queue)
- *
- * Revision 1.5 2005/06/14 18:58:35 deva
- * *** empty log message ***
- *
- * Revision 1.4 2005/06/14 12:29:40 deva
- * Incorporated the use of the Info object everywhere... also using the log functionality.
- *
- * Revision 1.3 2005/05/26 21:32:39 deva
- * *** empty log message ***
- *
- * Revision 1.2 2005/05/26 12:48:36 deva
- * *** empty log message ***
- *
- * Revision 1.1 2005/05/22 15:49:22 deva
- * Added multithreaded encoding support.
- *
- */
#include <config.h>
#include "mov_encoder_writer.h"
diff --git a/src/mov_encoder_writer.h b/src/mov_encoder_writer.h
index d197f2e..afb0d47 100644
--- a/src/mov_encoder_writer.h
+++ b/src/mov_encoder_writer.h
@@ -24,38 +24,6 @@
* along with MIaV; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
-
-/*
- * $Id$
- */
-
-/*
- * $Log$
- * Revision 1.7 2005/07/09 16:23:15 deva
- * Added audio.
- *
- * Revision 1.6 2005/07/07 12:42:19 deva
- * *** empty log message ***
- *
- * Revision 1.5 2005/07/05 23:15:16 deva
- * *** empty log message ***
- *
- * Revision 1.4 2005/06/16 21:28:57 deva
- * Rewrote thread object
- * Fixed bug in mov_encoder (pushed read_sem too many times, whihc lead to
- * growing server queue)
- *
- * Revision 1.3 2005/06/14 12:29:40 deva
- * Incorporated the use of the Info object everywhere... also using the log functionality.
- *
- * Revision 1.2 2005/05/26 12:48:36 deva
- * *** empty log message ***
- *
- * Revision 1.1 2005/05/22 15:49:22 deva
- * Added multithreaded encoding support.
- *
- */
-
#include <config.h>
#ifndef __MIAV_MOV_ENCODER_WRITER_H__
#define __MIAV_MOV_ENCODER_WRITER_H__
diff --git a/src/network.cc b/src/network.cc
index d21b8fe..799bc98 100644
--- a/src/network.cc
+++ b/src/network.cc
@@ -24,25 +24,6 @@
* along with MIaV; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
-
-/*
- * $Id$
- */
-
-/*
- * $Log$
- * Revision 1.5 2005/06/02 15:03:23 deva
- *
- * Fixed crash in network.cc if socket not connected.
- * Added option to skop ecery second frame in player
- *
- * Revision 1.4 2005/05/03 08:31:59 deva
- * Removed the error object, and replaced it with a more generic info object.
- *
- * Revision 1.3 2005/05/01 09:56:26 deva
- * Added Id and Log tags to all files
- */
-
#include <config.h>
#include "network.h"
diff --git a/src/network.h b/src/network.h
index 4d92307..39faff9 100644
--- a/src/network.h
+++ b/src/network.h
@@ -24,20 +24,6 @@
* along with MIaV; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
-
-/*
- * $Id$
- */
-
-/*
- * $Log$
- * Revision 1.4 2005/05/03 08:31:59 deva
- * Removed the error object, and replaced it with a more generic info object.
- *
- * Revision 1.3 2005/05/01 09:56:26 deva
- * Added Id and Log tags to all files
- */
-
#include <config.h>
#ifndef __MIAVLIB_NETWORK_H__
#define __MIAVLIB_NETWORK_H__
diff --git a/src/package.h b/src/package.h
index 9f09648..77e74b7 100644
--- a/src/package.h
+++ b/src/package.h
@@ -24,20 +24,6 @@
* along with MIaV; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
-
-/*
- * $Id$
- */
-
-/*
- * $Log$
- * Revision 1.4 2005/05/03 08:31:59 deva
- * Removed the error object, and replaced it with a more generic info object.
- *
- * Revision 1.3 2005/05/01 09:56:26 deva
- * Added Id and Log tags to all files
- *
- */
#include <config.h>
#ifndef __MIAVLIB_PACKAGE_H__
#define __MIAVLIB_PACKAGE_H__
diff --git a/src/player.cc b/src/player.cc
index 42b4f5d..bb495e5 100644
--- a/src/player.cc
+++ b/src/player.cc
@@ -32,50 +32,6 @@
* along with MIaV; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
-
-/*
- * $Id$
- */
-
-/*
- * $Log$
- * Revision 1.32 2005/07/27 12:40:47 deva
- * *** empty log message ***
- *
- * Revision 1.31 2005/07/26 16:16:56 deva
- *
- * Added fullscreen functionality.
- *
- * Revision 1.30 2005/07/25 16:18:34 deva
- * *** empty log message ***
- *
- * Revision 1.29 2005/07/25 16:09:47 deva
- * *** empty log message ***
- *
- * Revision 1.28 2005/07/25 15:56:27 deva
- * *** empty log message ***
- *
- * Revision 1.27 2005/07/25 14:27:14 deva
- * *** empty log message ***
- *
- * Revision 1.26 2005/07/25 12:42:13 deva
- * *** empty log message ***
- *
- * Revision 1.25 2005/06/16 21:28:57 deva
- * Rewrote thread object
- * Fixed bug in mov_encoder (pushed read_sem too many times, whihc lead to
- * growing server queue)
- *
- * Revision 1.24 2005/06/09 11:00:03 deva
- * Added daemon code, and cleaned up using -Wall and -Werror
- *
- * Revision 1.23 2005/05/03 08:31:59 deva
- * Removed the error object, and replaced it with a more generic info object.
- *
- * Revision 1.22 2005/05/01 09:56:26 deva
- * Added Id and Log tags to all files
- */
-
#include <config.h>
#ifdef USE_GUI
diff --git a/src/player.h b/src/player.h
index b7394c6..851a5a7 100644
--- a/src/player.h
+++ b/src/player.h
@@ -32,41 +32,6 @@
* along with MIaV; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
-
-/*
- * $Id$
- */
-
-/*
- * $Log$
- * Revision 1.13 2005/07/26 16:16:56 deva
- *
- * Added fullscreen functionality.
- *
- * Revision 1.12 2005/07/25 16:18:34 deva
- * *** empty log message ***
- *
- * Revision 1.11 2005/07/25 16:09:47 deva
- * *** empty log message ***
- *
- * Revision 1.10 2005/07/25 15:56:27 deva
- * *** empty log message ***
- *
- * Revision 1.9 2005/07/25 12:42:13 deva
- * *** empty log message ***
- *
- * Revision 1.8 2005/06/16 21:28:57 deva
- * Rewrote thread object
- * Fixed bug in mov_encoder (pushed read_sem too many times, whihc lead to
- * growing server queue)
- *
- * Revision 1.7 2005/05/03 08:31:59 deva
- * Removed the error object, and replaced it with a more generic info object.
- *
- * Revision 1.6 2005/05/01 09:56:26 deva
- * Added Id and Log tags to all files
- */
-
#include <config.h>
#ifdef USE_GUI
diff --git a/src/queue.h b/src/queue.h
index fa03c8e..ac269e5 100644
--- a/src/queue.h
+++ b/src/queue.h
@@ -31,36 +31,6 @@
* along with MIaV; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
-
-/*
- * $Id$
- */
-
-/*
- * $Log$
- * Revision 1.17 2005/05/22 15:49:22 deva
- * Added multithreaded encoding support.
- *
- * Revision 1.16 2005/05/19 14:10:22 deva
- *
- * Multithreading rulez?
- *
- * Revision 1.15 2005/05/16 16:00:57 deva
- *
- * Lots of stuff!
- *
- * Revision 1.14 2005/05/07 10:25:34 deva
- *
- * Removed ffmpeg code from img_encoder and corrected decoding errors in mov_encoder
- *
- * Revision 1.13 2005/05/03 08:31:59 deva
- * Removed the error object, and replaced it with a more generic info object.
- *
- * Revision 1.12 2005/05/01 09:56:26 deva
- * Added Id and Log tags to all files
- *
- */
-
#include <config.h>
#ifndef __RTVIDEOREC_QUEUE_H
#define __RTVIDEOREC_QUEUE_H
diff --git a/src/server.cc b/src/server.cc
index 35dbb9d..bdca907 100644
--- a/src/server.cc
+++ b/src/server.cc
@@ -24,71 +24,6 @@
* along with MIaV; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
-
-/*
- * $Id$
- */
-
-/*
- * $Log$
- * Revision 1.25 2005/06/19 20:04:43 deva
- * ImgEncoder now uses the file class for output, through jpeg_mem_dest.
- *
- * Revision 1.24 2005/06/19 11:44:14 deva
- * Cleaned up a log of logging.
- * Fixed server queue (shouldn't happen).
- * Added user and group lookup.
- *
- * Revision 1.23 2005/06/14 18:58:35 deva
- * *** empty log message ***
- *
- * Revision 1.22 2005/06/14 12:29:40 deva
- * Incorporated the use of the Info object everywhere... also using the log functionality.
- *
- * Revision 1.21 2005/05/26 21:32:39 deva
- * *** empty log message ***
- *
- * Revision 1.20 2005/05/26 12:48:36 deva
- * *** empty log message ***
- *
- * Revision 1.19 2005/05/22 16:34:44 deva
- * Fix: Connection is now taken down when taking a sanpshot without recording.
- *
- * Revision 1.18 2005/05/22 15:49:22 deva
- * Added multithreaded encoding support.
- *
- * Revision 1.17 2005/05/17 19:16:26 deva
- * Made new mpeg writer work, with proper file permissions.
- *
- * Revision 1.16 2005/05/17 15:12:51 deva
- * Fixed file rights (All read on files and directories, and all execute on directories).
- *
- * Revision 1.15 2005/05/17 14:30:56 deva
- * Added code, preparing threaded encoding.
- *
- * Revision 1.14 2005/05/16 16:00:57 deva
- * Lots of stuff!
- *
- * Revision 1.13 2005/05/09 16:40:20 deva
- * Added optimize yuv conversion code
- *
- * Revision 1.12 2005/05/07 10:56:18 deva
- * Changed print outs
- *
- * Revision 1.11 2005/05/03 08:31:59 deva
- * Removed the error object, and replaced it with a more generic info object.
- *
- * Revision 1.10 2005/05/02 19:47:43 deva
- * Fixed overlapping cpr numbers on the server (now it saves one cpr pr.
- * connection, and ignores any changes sent)
- *
- * Revision 1.9 2005/05/02 18:46:15 deva
- * Files are now saved in a custom folder (defined in miav.conf)
- *
- * Revision 1.8 2005/05/01 09:56:26 deva
- * Added Id and Log tags to all files
- */
-
#include "server.h"
#include "miav.h"
diff --git a/src/server.h b/src/server.h
index 0f14adf..7126a75 100644
--- a/src/server.h
+++ b/src/server.h
@@ -24,24 +24,6 @@
* along with MIaV; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
-
-/*
- * $Id$
- */
-
-/*
- * $Log$
- * Revision 1.5 2005/06/14 12:29:40 deva
- * Incorporated the use of the Info object everywhere... also using the log functionality.
- *
- * Revision 1.4 2005/05/03 08:31:59 deva
- * Removed the error object, and replaced it with a more generic info object.
- *
- * Revision 1.3 2005/05/01 09:56:26 deva
- * Added Id and Log tags to all files
- *
- */
-
#ifndef __SERVER_H__
#define __SERVER_H__
diff --git a/src/server_status.cc b/src/server_status.cc
index 2b2395c..7f4714e 100644
--- a/src/server_status.cc
+++ b/src/server_status.cc
@@ -24,44 +24,6 @@
* along with MIaV; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
-
-/*
- * $Id$
- */
-
-/*
- * $Log$
- * Revision 1.10 2005/06/19 20:04:43 deva
- * ImgEncoder now uses the file class for output, through jpeg_mem_dest.
- *
- * Revision 1.9 2005/06/19 11:44:14 deva
- * Cleaned up a log of logging.
- * Fixed server queue (shouldn't happen).
- * Added user and group lookup.
- *
- * Revision 1.8 2005/05/22 15:49:22 deva
- * Added multithreaded encoding support.
- *
- * Revision 1.7 2005/05/17 15:12:51 deva
- * Fixed file rights (All read on files and directories, and all execute on directories).
- *
- * Revision 1.6 2005/05/16 16:00:57 deva
- * Lots of stuff!
- *
- * Revision 1.5 2005/05/16 13:25:52 deva
- * Moved video setting to configuration file.
- * Fine tuned setting for 2.4ghz server
- *
- * Revision 1.4 2005/05/09 16:40:20 deva
- * Added optimize yuv conversion code
- *
- * Revision 1.3 2005/05/03 08:31:59 deva
- * Removed the error object, and replaced it with a more generic info object.
- *
- * Revision 1.2 2005/05/01 09:56:26 deva
- * Added Id and Log tags to all files
- */
-
#include <config.h>
#include "server_status.h"
diff --git a/src/server_status.h b/src/server_status.h
index 73b8ecb..564840e 100644
--- a/src/server_status.h
+++ b/src/server_status.h
@@ -24,29 +24,6 @@
* along with MIaV; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
-
-/*
- * $Id$
- */
-
-/*
- * $Log$
- * Revision 1.5 2005/06/19 20:04:43 deva
- * ImgEncoder now uses the file class for output, through jpeg_mem_dest.
- *
- * Revision 1.4 2005/06/19 11:44:14 deva
- * Cleaned up a log of logging.
- * Fixed server queue (shouldn't happen).
- * Added user and group lookup.
- *
- * Revision 1.3 2005/05/03 08:31:59 deva
- * Removed the error object, and replaced it with a more generic info object.
- *
- * Revision 1.2 2005/05/01 09:56:26 deva
- * Added Id and Log tags to all files
- *
- */
-
#include <config.h>
#ifndef __MIAV_SERVER_STATUS_H__
#define __MIAV_SERVER_STATUS_H__
diff --git a/src/socket.cc b/src/socket.cc
index 91b8e34..2ae88dc 100644
--- a/src/socket.cc
+++ b/src/socket.cc
@@ -24,33 +24,6 @@
* along with MIaV; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
-
-/*
- * $Id$
- */
-
-/*
- * $Log$
- * Revision 1.7 2005/06/19 11:44:14 deva
- * Cleaned up a log of logging.
- * Fixed server queue (shouldn't happen).
- * Added user and group lookup.
- *
- * Revision 1.6 2005/06/02 15:03:23 deva
- *
- * Fixed crash in network.cc if socket not connected.
- * Added option to skop ecery second frame in player
- *
- * Revision 1.5 2005/05/03 17:13:25 deva
- * Fixed some missong Info object references.
- *
- * Revision 1.4 2005/05/03 08:31:59 deva
- * Removed the error object, and replaced it with a more generic info object.
- *
- * Revision 1.3 2005/05/01 09:56:26 deva
- * Added Id and Log tags to all files
- */
-
#include <config.h>
#include "socket.h"
diff --git a/src/socket.h b/src/socket.h
index 41ada6d..a066f50 100644
--- a/src/socket.h
+++ b/src/socket.h
@@ -24,29 +24,6 @@
* along with MIaV; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
-
-/*
- * $Id$
- */
-
-/*
- * $Log$
- * Revision 1.6 2005/06/19 11:44:14 deva
- * Cleaned up a log of logging.
- * Fixed server queue (shouldn't happen).
- * Added user and group lookup.
- *
- * Revision 1.5 2005/05/03 17:13:25 deva
- * Fixed some missong Info object references.
- *
- * Revision 1.4 2005/05/03 08:31:59 deva
- * Removed the error object, and replaced it with a more generic info object.
- *
- * Revision 1.3 2005/05/01 09:56:26 deva
- * Added Id and Log tags to all files
- *
- */
-
#include <config.h>
#ifndef __MIAVLIB_SOCKET_H__
#define __MIAVLIB_SOCKET_H__
diff --git a/src/thread.cc b/src/thread.cc
index e38774e..23b142a 100644
--- a/src/thread.cc
+++ b/src/thread.cc
@@ -24,25 +24,6 @@
* along with MIaV; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
-
-/*
- * $Id$
- */
-
-/*
- * $Log$
- * Revision 1.4 2005/06/16 21:28:57 deva
- * Rewrote thread object
- * Fixed bug in mov_encoder (pushed read_sem too many times, whihc lead to
- * growing server queue)
- *
- * Revision 1.3 2005/05/03 08:31:59 deva
- * Removed the error object, and replaced it with a more generic info object.
- *
- * Revision 1.2 2005/05/01 09:56:26 deva
- * Added Id and Log tags to all files
- */
-
#include <config.h>
#include "thread.h"
diff --git a/src/thread.h b/src/thread.h
index b7f3f98..46ccadd 100644
--- a/src/thread.h
+++ b/src/thread.h
@@ -24,26 +24,6 @@
* along with MIaV; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
-
-/*
- * $Id$
- */
-
-/*
- * $Log$
- * Revision 1.4 2005/06/16 21:28:57 deva
- * Rewrote thread object
- * Fixed bug in mov_encoder (pushed read_sem too many times, whihc lead to
- * growing server queue)
- *
- * Revision 1.3 2005/05/03 08:31:59 deva
- * Removed the error object, and replaced it with a more generic info object.
- *
- * Revision 1.2 2005/05/01 09:56:26 deva
- * Added Id and Log tags to all files
- *
- */
-
#include <config.h>
#ifndef __THREAD_H__
#define __THREAD_H__
diff --git a/src/util.cc b/src/util.cc
index 86689e5..a3fdd1c 100644
--- a/src/util.cc
+++ b/src/util.cc
@@ -31,20 +31,6 @@
* along with MIaV; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
-
-/*
- * $Id$
- */
-
-/*
- * $Log$
- * Revision 1.3 2005/05/03 08:31:59 deva
- * Removed the error object, and replaced it with a more generic info object.
- *
- * Revision 1.2 2005/05/01 09:56:26 deva
- * Added Id and Log tags to all files
- */
-
#include <config.h>
#include <stdio.h>
diff --git a/src/util.h b/src/util.h
index ba6774b..effa5dd 100644
--- a/src/util.h
+++ b/src/util.h
@@ -31,21 +31,6 @@
* along with MIaV; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
-
-/*
- * $Id$
- */
-
-/*
- * $Log$
- * Revision 1.4 2005/05/03 08:31:59 deva
- * Removed the error object, and replaced it with a more generic info object.
- *
- * Revision 1.3 2005/05/01 09:56:26 deva
- * Added Id and Log tags to all files
- *
- */
-
#include <config.h>
#ifndef __RTVIDEOREC_UTIL_H
#define __RTVIDEOREC_UTIL_H
diff --git a/src/videowidget.cc b/src/videowidget.cc
index 04eb271..37cd5d5 100644
--- a/src/videowidget.cc
+++ b/src/videowidget.cc
@@ -24,38 +24,6 @@
* along with MIaV; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
-
-/*
- * $Id$
- */
-
-/*
- * $Log$
- * Revision 1.9 2005/07/27 12:40:47 deva
- * *** empty log message ***
- *
- * Revision 1.8 2005/07/26 16:16:56 deva
- *
- * Added fullscreen functionality.
- *
- * Revision 1.7 2005/07/25 16:18:34 deva
- * *** empty log message ***
- *
- * Revision 1.6 2005/07/25 15:56:27 deva
- * *** empty log message ***
- *
- * Revision 1.5 2005/07/25 15:40:07 deva
- * *** empty log message ***
- *
- * Revision 1.4 2005/07/25 15:35:41 deva
- * *** empty log message ***
- *
- * Revision 1.3 2005/05/03 08:31:59 deva
- * Removed the error object, and replaced it with a more generic info object.
- *
- * Revision 1.2 2005/05/01 09:56:26 deva
- * Added Id and Log tags to all files
- */
#include <config.h>
#ifdef USE_GUI
diff --git a/src/videowidget.h b/src/videowidget.h
index 05df0ae..eaacd4f 100644
--- a/src/videowidget.h
+++ b/src/videowidget.h
@@ -24,32 +24,6 @@
* along with MIaV; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
-
-/*
- * $Id$
- */
-
-/*
- * $Log$
- * Revision 1.7 2005/07/26 16:16:56 deva
- *
- * Added fullscreen functionality.
- *
- * Revision 1.6 2005/07/25 15:56:27 deva
- * *** empty log message ***
- *
- * Revision 1.5 2005/07/25 15:35:41 deva
- * *** empty log message ***
- *
- * Revision 1.4 2005/05/03 08:31:59 deva
- * Removed the error object, and replaced it with a more generic info object.
- *
- * Revision 1.3 2005/05/01 09:56:26 deva
- * Added Id and Log tags to all files
- *
- * Revision 1.2 2005/05/01 09:33:47 deva
- * *** empty log message ***
- */
#include <config.h>
#ifdef USE_GUI
diff --git a/tools/MIaVAdd b/tools/MIaVAdd
index e066b04..167fe40 100755
--- a/tools/MIaVAdd
+++ b/tools/MIaVAdd
@@ -27,17 +27,6 @@ function allfile() {
echo " * along with MIaV; if not, write to the Free Software" >> $1;
echo " * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA." >> $1;
echo " */" >> $1;
- echo "" >> $1;
- echo "/*" >> $1;
- echo -n " * \$" >> $1;
- echo "Id$" >> $1;
- echo " */" >> $1;
- echo "" >> $1;
- echo "/*" >> $1;
- echo -n " * \$" >> $1;
- echo "Log$" >> $1;
- echo " */" >> $1;
- echo "" >> $1;
echo "#include <config.h>" >> $1;
}