diff options
author | Bent Bisballe Nyeng <deva@aasimon.org> | 2014-05-14 14:24:34 +0200 |
---|---|---|
committer | Bent Bisballe Nyeng <deva@aasimon.org> | 2014-05-14 14:24:34 +0200 |
commit | 0ff825e0e6fe5fc7238e3964d24779a07cb53518 (patch) | |
tree | 7b47a9fe58a09e12ed99fdfacc84fff198ce5ce1 /src/encoder.cc | |
parent | 29ae5ac36d4ffc520232ff393b2455130ec0227e (diff) |
Split miav server and client apart. Port client to Qt4. Replace libraw1994 with libiec61883. Add unit tests for multiplexer and fix some bugs in it.
Diffstat (limited to 'src/encoder.cc')
-rw-r--r-- | src/encoder.cc | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/encoder.cc b/src/encoder.cc index e7b79bf..a688585 100644 --- a/src/encoder.cc +++ b/src/encoder.cc @@ -32,11 +32,9 @@ * along with MIaV; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ -#include <config.h> -#ifdef USE_GUI +#include "encoder.h" #include "util.h" -#include "encoder.h" Encoder::Encoder(Info *ginfo, const char *gip, @@ -120,7 +118,7 @@ void Encoder::encode() if(savestate != NO_CHANGE) savestate_sent = true; h.header_type = DATA_HEADER; - sprintf(h.header.h_data.cpr, cpr); + sprintf(h.header.h_data.cpr, "%s", cpr); h.header.h_data.freeze = frame->freeze; h.header.h_data.snapshot = frame->shoot; h.header.h_data.record = frame->record; @@ -269,5 +267,3 @@ void Encoder::stop(n_savestate save) } */ } - -#endif /*USE_GUI*/ |