Merge CV, ver=5.1; ops/methods from HV, and interface from CV where possible

[goodguy/history.git] / cinelerra-5.0 / cinelerra / shmemory.h

diff --git a/cinelerra-5.0/cinelerra/shmemory.h b/cinelerra-5.0/cinelerra/shmemory.h
deleted file mode 100644 (file)
index 5417a11..0000000
--- a/cinelerra-5.0/cinelerra/shmemory.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-/*
- * CINELERRA
- * Copyright (C) 2008 Adam Williams <broadcast at earthling dot net>
- * 
- * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- * 
- */
-
-#ifndef SHMEM_H
-#define SHMEM_H
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <sys/ipc.h>
-#include <sys/shm.h>
-
-class SharedMem
-{
-public:
-       SharedMem(long size);
-       SharedMem(int id, long size);
-       ~SharedMem();
-
-       int get_id();
-       long get_size();
-
-       char *data;
-       long size;
-       int shmid;
-       int client;
-};
-
-
-#endif