[Mplayer-cvslog] CVS: main/osdep timer-win2.c,NONE,1.1 glob.h,NONE,1.1 glob-win.c,NONE,1.1 Makefile,1.10,1.11 getch2-win.c,1.2,1.3

[Sascha Sommer CVS]

Update of /cvsroot/mplayer/main/osdep
In directory mail:/var/tmp.root/cvs-serv2152

Modified Files:
	Makefile getch2-win.c 
Added Files:
	timer-win2.c glob.h glob-win.c 
Log Message:
alternative timer and glob emulation code for mingw32 port

--- NEW FILE ---
// Precise timer routines for WINDOWS

#include <windows.h>
#include <mmsystem.h>
#include "timer.h"

// Returns current time in microseconds
unsigned int GetTimer(){
  return timeGetTime() * 1000;
}

// Returns current time in milliseconds
unsigned int GetTimerMS(){
  return timeGetTime() ;
}

int usec_sleep(int usec_delay){
  Sleep( usec_delay/1000);
  return 0;
}

static DWORD RelativeTime = 0;

float GetRelativeTime(){
  DWORD t, r;
  t = GetTimer();
  r = t - RelativeTime;
  RelativeTime = t;
  return (float) r *0.000001F;
}

void InitTimer(){
  GetRelativeTime();
}

--- NEW FILE ---
#include "../config.h"

#ifndef HAVE_GLOB
#ifdef __MINGW32__
typedef struct {
  size_t gl_pathc;
  char **gl_pathv;
  size_t gl_offs;
} glob_t;

void globfree(glob_t *pglob);

int  glob(const char *pattern, int flags, int (*errfunc)(const char *epath, int eerrno), glob_t *pglob);

#endif
#endif

--- NEW FILE ---
#include <sys/types.h>
#include <stdio.h>

#include "../config.h"

#ifndef HAVE_GLOB
#ifdef __MINGW32__
#undef DATADIR
#include <windows.h>
#include "glob.h"

int glob(const char *pattern, int flags,
          int (*errfunc)(const char *epath, int eerrno), glob_t *pglob)
{
	HANDLE searchhndl;
    WIN32_FIND_DATA found_file;
 	if(errfunc)printf("glob():ERROR:Sorry errfunc not supported by this implementation\n");
	if(flags)printf("glob():ERROR:Sorry no flags supported by this globimplementation\n");
	//printf("PATTERN \"%s\"\n",pattern);
	pglob->gl_pathc = 0;
	searchhndl = FindFirstFile( pattern,&found_file);
    if(searchhndl == INVALID_HANDLE_VALUE)
	{
		if(GetLastError() == ERROR_FILE_NOT_FOUND)
		{
			pglob->gl_pathc = 0;
		    //printf("could not find a file matching your search criteria\n");
	        return 1;
		}
		else 
		{
			//printf("glob():ERROR:FindFirstFile: %i\n",GetLastError());
			return 1;
		}
	 }
    pglob->gl_pathv = malloc(sizeof(char*));
    pglob->gl_pathv[0] = strdup(found_file.cFileName);
    pglob->gl_pathc++;
    while(1)
    {
		if(!FindNextFile(searchhndl,&found_file))
		{
			if(GetLastError()==ERROR_NO_MORE_FILES)
			{
				//printf("glob(): no more files found\n");
                break;
			}
			else
			{
				//printf("glob():ERROR:FindNextFile:%i\n",GetLastError());
				return 1;
			}
		}
		else
		{
            //printf("glob: found file %s\n",found_file.cFileName);
            pglob->gl_pathc++;       
            pglob->gl_pathv = realloc(pglob->gl_pathv,pglob->gl_pathc * sizeof(char*));
            pglob->gl_pathv[pglob->gl_pathc-1] = strdup(found_file.cFileName);       
 		}
    }
    FindClose(searchhndl);
    return 0;
}

void globfree(glob_t *pglob)
{
	int i;
	for(i=0; i <pglob->gl_pathc ;i++)
	{
		free(pglob->gl_pathv[i]);
	}
	free(pglob->gl_pathv);
}
#endif     /*__MINGW32__*/
#endif     /*HAVE_GLOB*/

#if 0
int main(){
   glob_t        gg;
   printf("globtest\n");
   glob( "*.jpeg",0,NULL,&gg );
   {
        int i;
        for(i=0;i<gg.gl_pathc;i++)printf("GLOBED:%i %s\n",i,gg.gl_pathv[i]);
    }
   globfree(&gg);
   
   return 0;
}
#endif

Index: Makefile
===================================================================
RCS file: /cvsroot/mplayer/main/osdep/Makefile,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- Makefile	4 Apr 2003 19:33:18 -0000	1.10
+++ Makefile	25 Apr 2003 10:00:18 -0000	1.11
@@ -17,11 +17,12 @@
 timer = timer-macosx.c
 endif
 ifeq ($(TARGET_CYGWIN),yes)
-timer = timer-win.c
+timer = timer-win2.c
 endif
 ifeq ($(TARGET_MINGW32),yes)
-timer = timer-win.c
+timer = timer-win2.c
 getch = getch2-win.c
+SRCS += glob-win.c
 endif
 SRCS += $(timer)
 SRCS += $(getch)

Index: getch2-win.c
===================================================================
RCS file: /cvsroot/mplayer/main/osdep/getch2-win.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- getch2-win.c	19 Apr 2003 09:19:30 -0000	1.2
+++ getch2-win.c	25 Apr 2003 10:00:18 -0000	1.3
@@ -99,7 +99,7 @@
 
 
 void getch2_enable(){
-	int retval;
+	DWORD retval;
     stdin = GetStdHandle(STD_INPUT_HANDLE);
    	if(!GetNumberOfConsoleInputEvents(stdin,&retval))
 	{