shmem.c removed

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@1707 b3059339-0415-0410-9bf9-f77b7e298cf2

5 files changed, 5 insertions, 95 deletions

diff --git a/Gui/gui.mak b/Gui/gui.mak
index 7895c9236f..efa122dcad 100644
--- a/Gui/gui.mak
+++ b/Gui/gui.mak
@@ -6,6 +6,6 @@ MPLAYERSRCS = $(MPLAYERDIR)mplayer.c $(MPLAYERDIR)widgets.c $(MPLAYERDIR)play.c
 	     $(MPLAYERDIR)psignal.c $(MPLAYERDIR)mixer.c
 MPLAYEROBJS = $(MPLAYERSRCS:.c=.o)
 
-SRCS = $(SKINSRC) $(BITMAPSRCS) wm/ws.c wm/wsconv.c app.c config.c events.c timer.c language.c error.c shmem.c
+SRCS = $(SKINSRC) $(BITMAPSRCS) wm/ws.c wm/wsconv.c app.c config.c events.c timer.c language.c error.c
 OBJS = $(SRCS:.c=.o)
 
diff --git a/Gui/language.c b/Gui/language.c
index 5323637300..75faba2b10 100644
--- a/Gui/language.c
+++ b/Gui/language.c
@@ -16,6 +16,8 @@ char * langRemove = "Remove";
 char * langNEMDB = "Sorry, not enough memory for draw buffer.";
 char * langNEMFMR = "Sorry, not enough memory for menu rendering.";
 char * langNEMFMM = "Sorry, not enough memory for main window shape mask.";
+
+#if 0
 char * langLIRCSNW = "LIRC support not working. Disabled.";
 char * langAudioDriverSelectNotSupported = "Your audio driver DOES NOT support select(). Recompile mplayer with #undef HAVE_AUDIO_SELECT in config.h !";
 char * langNotSupportedFileFormat = "Sorry, this file format not recognized/supported. If this file is an AVI, ASF or MPEG stream, please contact the author!";
@@ -40,4 +42,4 @@ char * langDSCodecNotFound = "ERROR: Couldn't open required DirectShow codec: %s
                              "Or you should disable DShow support.";
 char * langCantInitVideoDriver = "FATAL: Cannot initialize video driver!";
 char * langUnknowError = "Unknow error. Please contact the developer team.";
-
+#endif
diff --git a/Gui/mplayer/widgets.h b/Gui/mplayer/widgets.h
index 5101a2e4df..b2f9091bd9 100644
--- a/Gui/mplayer/widgets.h
+++ b/Gui/mplayer/widgets.h
@@ -5,7 +5,7 @@
 #include <gdk/gdkkeysyms.h>
 #include <gtk/gtk.h>
 
-#include "../shmem.h"
+#include "../../linux/shmem.h"
 
 typedef struct
 {
diff --git a/Gui/shmem.c b/Gui/shmem.c
deleted file mode 100644
index 6cdf108c80..0000000000
--- a/Gui/shmem.c
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- *   shmem.c - Shared memory allocation
- *   
- *   based on mpg123's xfermem.c by
- *   Oliver Fromme  <oliver.fromme@heim3.tu-clausthal.de>
- *   Sun Apr  6 02:26:26 MET DST 1997
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <errno.h>
-#include <sys/types.h>
-#include <sys/time.h>
-#include <sys/uio.h>
-#include <sys/mman.h>
-#include <sys/socket.h>
-#include <fcntl.h>
-
-#ifdef AIX
-#include <sys/select.h>
-#endif
-
-#include <sys/ipc.h>
-#include <sys/shm.h>
-
-extern int errno;
-
-#if defined(MAP_ANONYMOUS) && !defined(MAP_ANON)
-#define MAP_ANON MAP_ANONYMOUS
-#endif
-
-static int shmem_type=0;
-
-void* shmem_alloc(int size){
-void* p;
-static int devzero = -1;
-while(1){
-  switch(shmem_type){
-  case 0:  // ========= MAP_ANON|MAP_SHARED ==========
-#ifdef MAP_ANON
-    p=mmap(0,size,PROT_READ|PROT_WRITE,MAP_ANON|MAP_SHARED,-1,0);
-    if(p==MAP_FAILED) break; // failed
-//    printf("shmem: %d bytes allocated using mmap anon (%X)\n",size,p);
-    return p;
-#else
-// system does not support MAP_ANON at all (e.g. solaris 2.5.1/2.6), just fail
-    break;
-#endif
-  case 1:  // ========= MAP_SHARED + /dev/zero ==========
-    if (devzero == -1 && (devzero = open("/dev/zero", O_RDWR, 0)) == -1) break;
-    p=mmap(0,size,PROT_READ|PROT_WRITE,MAP_SHARED,devzero,0);
-    if(p==MAP_FAILED) break; // failed
-//    printf("shmem: %d bytes allocated using mmap /dev/zero (%X)\n",size,p);
-    return p;
-  case 2: { // ========= shmget() ==========
-    struct shmid_ds shmemds;
-    int shmemid;
-    if ((shmemid = shmget(IPC_PRIVATE, size, IPC_CREAT | 0600)) == -1) break;
-    if ((int)(p = shmat(shmemid, 0, 0)) == -1){
-      perror ("shmat()");
-      shmctl (shmemid, IPC_RMID, &shmemds);
-      break;
-    }
-    if (shmctl(shmemid, IPC_RMID, &shmemds) == -1) {
-      perror ("shmctl()");
-      if (shmdt(p) == -1) perror ("shmdt()");
-      break;
-    }
-//    printf("shmem: %d bytes allocated using shmget() & shmat() (%X)\n",size,p);
-    return p;
-	}
-  default:
-    printf("FATAL: Cannot alloate %d bytes shared memory :(\n",size);
-    return NULL;
-  }
-  ++shmem_type;
-}
-}
-
-void shmem_free(void* p){
-  switch(shmem_type){
-    case 2:
-	    if (shmdt(p) == -1) perror ("shmdt()");
-      break;
-  }
-}
diff --git a/Gui/shmem.h b/Gui/shmem.h
deleted file mode 100644
index 58ceee4e44..0000000000
--- a/Gui/shmem.h
+++ /dev/null
@@ -1,4 +0,0 @@
-
-void* shmem_alloc(int size);
-void shmem_free(void* p);
-