Commit 9e2609e1 authored by David Johnson's avatar David Johnson
Browse files

* mezzanine/examples/simple/Makefile:

   - change so that `simple' binary gets installed appropriately
* mezzanine/examples/simple/simple.c:
   - give `simple' a mezzanine file to connect to on command line.
* mezzanine/libmezz/mezz.c:
   - fix ipc bugs
* mezzanine/mezzanine/Makefile:
   - linux compile changes
* mezzanine/mezzanine/mezzanine.c:
   - ipc bugfixes
parent 5c592c8c
......@@ -2,7 +2,7 @@
# Desc: Makefile for Mezzanine
# Author: Andrew Howard
# Date: 21 Mar 2001
# CVS: $Id: Makefile,v 1.1 2004-12-12 23:36:33 johnsond Exp $
# CVS: $Id: Makefile,v 1.2 2004-12-15 05:06:17 johnsond Exp $
# Notes:
# - Requires the gtk+ 1.2.X library (gui toolkit), which is pretty standard.
# - Requires the gsl library (Gnu Scientific Library) which is in most
......@@ -71,7 +71,7 @@ install:
$(MKDIR) -p $(INSTALL_BIN)
$(MKDIR) -p $(INSTALL_ETC)
$(INSTALL) -m 755 mezzanine $(INSTALL_BIN)
$(INSTALL) -m 644 mezzanine.opt $(INSTALL_ETC)/mezzanine.opt
# $(INSTALL) -m 644 mezzanine.opt $(INSTALL_ETC)/mezzanine.opt
# Dependancies (generated by 'make dep')
......
......@@ -21,7 +21,7 @@
* Desc: Mezzanine entry point
* Author: Andrew Howard
* Date: 28 Mar 2002
* CVS: $Id: mezzanine.c,v 1.1 2004-12-12 23:36:33 johnsond Exp $
* CVS: $Id: mezzanine.c,v 1.2 2004-12-15 05:06:17 johnsond Exp $
***************************************************************************/
#include <signal.h>
......@@ -30,6 +30,7 @@
#include "err.h"
#include "opt.h"
#include "mezzanine.h"
#include <string.h>
// Set flag to 1 to force program to quit
static int quit = 0;
......@@ -49,7 +50,7 @@ double gettime()
}
// convert slashes to '_' chars
void strip_slashes(char *s) {
char *strip_slashes(char *s) {
char *p;
if (s != NULL) {
for (p = s; *p != '\0'; ++p) {
......@@ -89,6 +90,8 @@ int main(int argc, char *argv[])
if (tmpdir == NULL)
tmpdir = "/tmp";
// char *sd = strdup(opt_get_string("fgrab","device","unknown_device"));
snprintf(ipcfilename,sizeof(ipcfilename),"%s/mezz_instance%s.ipc",
tmpdir,opt_get_string("fgrab","device","unknown_device"));
......@@ -144,9 +147,9 @@ int main(int argc, char *argv[])
time[3] += gettime();
// Display stats
printf("%3.0f %3.0f %3.0f %3.0f \r", 1000 * time[0], 1000 * time[1],
1000 * time[2], 1000 * time[3]);
fflush(stdout);
// printf("%3.0f %3.0f %3.0f %3.0f \r", 1000 * time[0], 1000 * time[1],
// 1000 * time[2], 1000 * time[3]);
// fflush(stdout);
mmap->time = gettime();
mezz_raise_event();
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment