Author: remi Date: 2009-02-15 19:07:29 +0100 (Sun, 15 Feb 2009) New Revision: 3639
Modified: software_suite_v2/tuxware/tuxosl-ose/trunk/include/channel.h software_suite_v2/tuxware/tuxosl-ose/trunk/include/config.h software_suite_v2/tuxware/tuxosl-ose/trunk/include/equalizer.h software_suite_v2/tuxware/tuxosl-ose/trunk/include/fifo.h software_suite_v2/tuxware/tuxosl-ose/trunk/include/log.h software_suite_v2/tuxware/tuxosl-ose/trunk/include/misc.h software_suite_v2/tuxware/tuxosl-ose/trunk/include/miscCompat.h software_suite_v2/tuxware/tuxosl-ose/trunk/include/mixer.h software_suite_v2/tuxware/tuxosl-ose/trunk/include/profiler.h software_suite_v2/tuxware/tuxosl-ose/trunk/include/threading.h software_suite_v2/tuxware/tuxosl-ose/trunk/include/types.h software_suite_v2/tuxware/tuxosl-ose/trunk/include/unix/miscCompat.h software_suite_v2/tuxware/tuxosl-ose/trunk/include/unix/threading.h software_suite_v2/tuxware/tuxosl-ose/trunk/include/wav_player.h software_suite_v2/tuxware/tuxosl-ose/trunk/include/win32/miscCompat.h software_suite_v2/tuxware/tuxosl-ose/trunk/include/win32/playback.h software_suite_v2/tuxware/tuxosl-ose/trunk/include/win32/threading.h software_suite_v2/tuxware/tuxosl-ose/trunk/src/channel.cpp software_suite_v2/tuxware/tuxosl-ose/trunk/src/equalizer.cpp software_suite_v2/tuxware/tuxosl-ose/trunk/src/fifo.cpp software_suite_v2/tuxware/tuxosl-ose/trunk/src/log.cpp software_suite_v2/tuxware/tuxosl-ose/trunk/src/misc.cpp software_suite_v2/tuxware/tuxosl-ose/trunk/src/mixer.cpp software_suite_v2/tuxware/tuxosl-ose/trunk/src/profiler.cpp software_suite_v2/tuxware/tuxosl-ose/trunk/src/wav_player.cpp software_suite_v2/tuxware/tuxosl-ose/trunk/src/win32/miscCompat.cpp software_suite_v2/tuxware/tuxosl-ose/trunk/src/win32/playback.cpp software_suite_v2/tuxware/tuxosl-ose/trunk/test/main.cpp Log: * fixed file formating (unix format) * trim white spaces Modified: software_suite_v2/tuxware/tuxosl-ose/trunk/include/channel.h =================================================================== --- software_suite_v2/tuxware/tuxosl-ose/trunk/include/channel.h 2009-02-15 18:01:40 UTC (rev 3638) +++ software_suite_v2/tuxware/tuxosl-ose/trunk/include/channel.h 2009-02-15 18:07:29 UTC (rev 3639) @@ -1,4 +1,4 @@ -/* +/* * Tux OSL - channel * Copyright (C) 2009 C2ME Sa <[email protected]> * Modified: software_suite_v2/tuxware/tuxosl-ose/trunk/include/config.h =================================================================== --- software_suite_v2/tuxware/tuxosl-ose/trunk/include/config.h 2009-02-15 18:01:40 UTC (rev 3638) +++ software_suite_v2/tuxware/tuxosl-ose/trunk/include/config.h 2009-02-15 18:07:29 UTC (rev 3639) @@ -1,4 +1,4 @@ -/* +/* * Tux OSL - config * Copyright (C) 2009 C2ME Sa <[email protected]> * Modified: software_suite_v2/tuxware/tuxosl-ose/trunk/include/equalizer.h =================================================================== --- software_suite_v2/tuxware/tuxosl-ose/trunk/include/equalizer.h 2009-02-15 18:01:40 UTC (rev 3638) +++ software_suite_v2/tuxware/tuxosl-ose/trunk/include/equalizer.h 2009-02-15 18:07:29 UTC (rev 3639) @@ -1,4 +1,4 @@ -/* +/* * Tux OSL - Audio equalizer * Copyright (C) 2009 C2ME Sa <[email protected]> * Modified: software_suite_v2/tuxware/tuxosl-ose/trunk/include/fifo.h =================================================================== --- software_suite_v2/tuxware/tuxosl-ose/trunk/include/fifo.h 2009-02-15 18:01:40 UTC (rev 3638) +++ software_suite_v2/tuxware/tuxosl-ose/trunk/include/fifo.h 2009-02-15 18:07:29 UTC (rev 3639) @@ -1,4 +1,4 @@ -/* +/* * Tux OSL - Circular fifo * Copyright (C) 2009 C2ME Sa <[email protected]> * Modified: software_suite_v2/tuxware/tuxosl-ose/trunk/include/log.h =================================================================== --- software_suite_v2/tuxware/tuxosl-ose/trunk/include/log.h 2009-02-15 18:01:40 UTC (rev 3638) +++ software_suite_v2/tuxware/tuxosl-ose/trunk/include/log.h 2009-02-15 18:07:29 UTC (rev 3639) @@ -1,4 +1,4 @@ -/* +/* * Tux Droid - Log * Copyright (C) 2007 C2ME S.A. <[email protected]> * Modified: software_suite_v2/tuxware/tuxosl-ose/trunk/include/misc.h =================================================================== --- software_suite_v2/tuxware/tuxosl-ose/trunk/include/misc.h 2009-02-15 18:01:40 UTC (rev 3638) +++ software_suite_v2/tuxware/tuxosl-ose/trunk/include/misc.h 2009-02-15 18:07:29 UTC (rev 3639) @@ -1,28 +1,28 @@ -/* - * Acness 2D Engine - Misc - * Copyright (C) Acness <[email protected]> - * - * 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, 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 _MISC_H_ -#define _MISC_H_ - -#include "miscCompat.h" - -unsigned long long int getTickCount(void); - -#endif /* _MISC_H_ */ +/* + * Acness 2D Engine - Misc + * Copyright (C) Acness <[email protected]> + * + * 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, 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 _MISC_H_ +#define _MISC_H_ + +#include "miscCompat.h" + +unsigned long long int getTickCount(void); + +#endif /* _MISC_H_ */ Modified: software_suite_v2/tuxware/tuxosl-ose/trunk/include/miscCompat.h =================================================================== --- software_suite_v2/tuxware/tuxosl-ose/trunk/include/miscCompat.h 2009-02-15 18:01:40 UTC (rev 3638) +++ software_suite_v2/tuxware/tuxosl-ose/trunk/include/miscCompat.h 2009-02-15 18:07:29 UTC (rev 3639) @@ -1,25 +1,25 @@ -/* - * Acness 2D Engine - Misc Compatibility - * Copyright (C) Acness <[email protected]> - * - * 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, 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. - */ - -#ifdef WIN32 -# include "win32/miscCompat.h" -#else -# include "unix/miscCompat.h" -#endif +/* + * Acness 2D Engine - Misc Compatibility + * Copyright (C) Acness <[email protected]> + * + * 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, 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. + */ + +#ifdef WIN32 +# include "win32/miscCompat.h" +#else +# include "unix/miscCompat.h" +#endif Modified: software_suite_v2/tuxware/tuxosl-ose/trunk/include/mixer.h =================================================================== --- software_suite_v2/tuxware/tuxosl-ose/trunk/include/mixer.h 2009-02-15 18:01:40 UTC (rev 3638) +++ software_suite_v2/tuxware/tuxosl-ose/trunk/include/mixer.h 2009-02-15 18:07:29 UTC (rev 3639) @@ -1,4 +1,4 @@ -/* +/* * Tux OSL - mixer * Copyright (C) 2009 C2ME Sa <[email protected]> * Modified: software_suite_v2/tuxware/tuxosl-ose/trunk/include/profiler.h =================================================================== --- software_suite_v2/tuxware/tuxosl-ose/trunk/include/profiler.h 2009-02-15 18:01:40 UTC (rev 3638) +++ software_suite_v2/tuxware/tuxosl-ose/trunk/include/profiler.h 2009-02-15 18:07:29 UTC (rev 3639) @@ -1,55 +1,55 @@ -/* - * Acness 2D Engine - Profiler - * Copyright (C) Acness <[email protected]> - * - * 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, 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 _PROFILER_H_ -#define _PROFILER_H_ - -/** - * \brief Profiler section structure. - */ -typedef struct -{ - unsigned long long int timeSum; - unsigned long long int previousTime; - unsigned long int callsCount; - bool isStarted; - char name[255]; -} profilerSectionInfo; - -/** - * \brief A simple profile class. - */ -class engineProfiler -{ - public: - engineProfiler(const char *outputFilename); - ~engineProfiler(); - void addNewSection(const char *sectionName); - void sectionBegin(const char *sectionName); - void sectionEnd(const char *sectionName); - private: - profilerSectionInfo *_sectionsList[256]; - unsigned short int _sectionsCount; - char _outputFilename[255]; - int getSectionIdFromName(const char *sectionName); - void computeStats(); -}; - -#endif /* _PROFILER_H_ */ +/* + * Acness 2D Engine - Profiler + * Copyright (C) Acness <[email protected]> + * + * 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, 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 _PROFILER_H_ +#define _PROFILER_H_ + +/** + * \brief Profiler section structure. + */ +typedef struct +{ + unsigned long long int timeSum; + unsigned long long int previousTime; + unsigned long int callsCount; + bool isStarted; + char name[255]; +} profilerSectionInfo; + +/** + * \brief A simple profile class. + */ +class engineProfiler +{ + public: + engineProfiler(const char *outputFilename); + ~engineProfiler(); + void addNewSection(const char *sectionName); + void sectionBegin(const char *sectionName); + void sectionEnd(const char *sectionName); + private: + profilerSectionInfo *_sectionsList[256]; + unsigned short int _sectionsCount; + char _outputFilename[255]; + int getSectionIdFromName(const char *sectionName); + void computeStats(); +}; + +#endif /* _PROFILER_H_ */ Modified: software_suite_v2/tuxware/tuxosl-ose/trunk/include/threading.h =================================================================== --- software_suite_v2/tuxware/tuxosl-ose/trunk/include/threading.h 2009-02-15 18:01:40 UTC (rev 3638) +++ software_suite_v2/tuxware/tuxosl-ose/trunk/include/threading.h 2009-02-15 18:07:29 UTC (rev 3639) @@ -1,4 +1,4 @@ -/* +/* * Tux OSL - Threading * Copyright (C) 2009 C2ME Sa <[email protected]> * Modified: software_suite_v2/tuxware/tuxosl-ose/trunk/include/types.h =================================================================== --- software_suite_v2/tuxware/tuxosl-ose/trunk/include/types.h 2009-02-15 18:01:40 UTC (rev 3638) +++ software_suite_v2/tuxware/tuxosl-ose/trunk/include/types.h 2009-02-15 18:07:29 UTC (rev 3639) @@ -1,4 +1,4 @@ -/* +/* * Tux OSL - types * Copyright (C) 2009 C2ME Sa <[email protected]> * Modified: software_suite_v2/tuxware/tuxosl-ose/trunk/include/unix/miscCompat.h =================================================================== --- software_suite_v2/tuxware/tuxosl-ose/trunk/include/unix/miscCompat.h 2009-02-15 18:01:40 UTC (rev 3638) +++ software_suite_v2/tuxware/tuxosl-ose/trunk/include/unix/miscCompat.h 2009-02-15 18:07:29 UTC (rev 3639) @@ -1,27 +1,27 @@ -/* - * Acness 2D Engine - Misc Compatibility - * Copyright (C) Acness <[email protected]> - * - * 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, 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 _MISCCOMPAT_H_ -#define _MISCCOMPAT_H_ - -#define LIBEXPORT __attribute__ ((visibility ("default"))) -#define LIBLOCAL __attribute__ ((visibility ("internal"))) - -#endif /* _MISCCOMPAT_H_ */ +/* + * Acness 2D Engine - Misc Compatibility + * Copyright (C) Acness <[email protected]> + * + * 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, 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 _MISCCOMPAT_H_ +#define _MISCCOMPAT_H_ + +#define LIBEXPORT __attribute__ ((visibility ("default"))) +#define LIBLOCAL __attribute__ ((visibility ("internal"))) + +#endif /* _MISCCOMPAT_H_ */ Modified: software_suite_v2/tuxware/tuxosl-ose/trunk/include/unix/threading.h =================================================================== --- software_suite_v2/tuxware/tuxosl-ose/trunk/include/unix/threading.h 2009-02-15 18:01:40 UTC (rev 3638) +++ software_suite_v2/tuxware/tuxosl-ose/trunk/include/unix/threading.h 2009-02-15 18:07:29 UTC (rev 3639) @@ -1,4 +1,4 @@ -/* +/* * Tux OSL - Threading * Copyright (C) 2009 C2ME Sa <[email protected]> * Modified: software_suite_v2/tuxware/tuxosl-ose/trunk/include/wav_player.h =================================================================== --- software_suite_v2/tuxware/tuxosl-ose/trunk/include/wav_player.h 2009-02-15 18:01:40 UTC (rev 3638) +++ software_suite_v2/tuxware/tuxosl-ose/trunk/include/wav_player.h 2009-02-15 18:07:29 UTC (rev 3639) @@ -1,4 +1,4 @@ -/* +/* * Tux OSL - wav player * Copyright (C) 2009 C2ME Sa <[email protected]> * Modified: software_suite_v2/tuxware/tuxosl-ose/trunk/include/win32/miscCompat.h =================================================================== --- software_suite_v2/tuxware/tuxosl-ose/trunk/include/win32/miscCompat.h 2009-02-15 18:01:40 UTC (rev 3638) +++ software_suite_v2/tuxware/tuxosl-ose/trunk/include/win32/miscCompat.h 2009-02-15 18:07:29 UTC (rev 3639) @@ -1,39 +1,39 @@ -/* - * Acness 2D Engine - Misc Compatibility - * Copyright (C) Acness <[email protected]> - * - * 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, 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 _MISCCOMPAT_H_ -#define _MISCCOMPAT_H_ - -#include <windows.h> - -#define sleep(sec) Sleep(sec * 1000) -#define usleep(usec) Sleep(usec / 1000) -#define LIBEXPORT __declspec(dllexport) -#define LIBLOCAL - -struct timezone -{ - int tz_minuteswest; /* minutes W of Greenwich */ - int tz_dsttime; /* type of dst correction */ -}; - -int gettimeofday(struct timeval *tv, struct timezone *tz); - -#endif /* _MISCCOMPAT_H_ */ +/* + * Acness 2D Engine - Misc Compatibility + * Copyright (C) Acness <[email protected]> + * + * 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, 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 _MISCCOMPAT_H_ +#define _MISCCOMPAT_H_ + +#include <windows.h> + +#define sleep(sec) Sleep(sec * 1000) +#define usleep(usec) Sleep(usec / 1000) +#define LIBEXPORT __declspec(dllexport) +#define LIBLOCAL + +struct timezone +{ + int tz_minuteswest; /* minutes W of Greenwich */ + int tz_dsttime; /* type of dst correction */ +}; + +int gettimeofday(struct timeval *tv, struct timezone *tz); + +#endif /* _MISCCOMPAT_H_ */ Modified: software_suite_v2/tuxware/tuxosl-ose/trunk/include/win32/playback.h =================================================================== --- software_suite_v2/tuxware/tuxosl-ose/trunk/include/win32/playback.h 2009-02-15 18:01:40 UTC (rev 3638) +++ software_suite_v2/tuxware/tuxosl-ose/trunk/include/win32/playback.h 2009-02-15 18:07:29 UTC (rev 3639) @@ -1,4 +1,4 @@ -/* +/* * Tux OSL - playback - Portaudio interface for Tuxdroid. * Copyright (C) 2009 C2ME Sa <[email protected]> * Modified: software_suite_v2/tuxware/tuxosl-ose/trunk/include/win32/threading.h =================================================================== --- software_suite_v2/tuxware/tuxosl-ose/trunk/include/win32/threading.h 2009-02-15 18:01:40 UTC (rev 3638) +++ software_suite_v2/tuxware/tuxosl-ose/trunk/include/win32/threading.h 2009-02-15 18:07:29 UTC (rev 3639) @@ -1,4 +1,4 @@ -/* +/* * Tux OSL - Threading * Copyright (C) 2009 C2ME Sa <[email protected]> * Modified: software_suite_v2/tuxware/tuxosl-ose/trunk/src/channel.cpp =================================================================== --- software_suite_v2/tuxware/tuxosl-ose/trunk/src/channel.cpp 2009-02-15 18:01:40 UTC (rev 3638) +++ software_suite_v2/tuxware/tuxosl-ose/trunk/src/channel.cpp 2009-02-15 18:07:29 UTC (rev 3639) @@ -1,4 +1,4 @@ -/* +/* * Tux OSL - channel * Copyright (C) 2009 C2ME Sa <[email protected]> * Modified: software_suite_v2/tuxware/tuxosl-ose/trunk/src/equalizer.cpp =================================================================== --- software_suite_v2/tuxware/tuxosl-ose/trunk/src/equalizer.cpp 2009-02-15 18:01:40 UTC (rev 3638) +++ software_suite_v2/tuxware/tuxosl-ose/trunk/src/equalizer.cpp 2009-02-15 18:07:29 UTC (rev 3639) @@ -1,4 +1,4 @@ -/* +/* * Tux OSL - Audio equalizer * Copyright (C) 2009 C2ME Sa <[email protected]> * Modified: software_suite_v2/tuxware/tuxosl-ose/trunk/src/fifo.cpp =================================================================== --- software_suite_v2/tuxware/tuxosl-ose/trunk/src/fifo.cpp 2009-02-15 18:01:40 UTC (rev 3638) +++ software_suite_v2/tuxware/tuxosl-ose/trunk/src/fifo.cpp 2009-02-15 18:07:29 UTC (rev 3639) @@ -1,4 +1,4 @@ -/* +/* * Tux OSL - Circular fifo * Copyright (C) 2009 C2ME Sa <[email protected]> * Modified: software_suite_v2/tuxware/tuxosl-ose/trunk/src/log.cpp =================================================================== --- software_suite_v2/tuxware/tuxosl-ose/trunk/src/log.cpp 2009-02-15 18:01:40 UTC (rev 3638) +++ software_suite_v2/tuxware/tuxosl-ose/trunk/src/log.cpp 2009-02-15 18:07:29 UTC (rev 3639) @@ -1,4 +1,4 @@ -/* +/* * Tux Droid - Log * Copyright (C) 2007 C2ME S.A. <[email protected]> * Modified: software_suite_v2/tuxware/tuxosl-ose/trunk/src/misc.cpp =================================================================== --- software_suite_v2/tuxware/tuxosl-ose/trunk/src/misc.cpp 2009-02-15 18:01:40 UTC (rev 3638) +++ software_suite_v2/tuxware/tuxosl-ose/trunk/src/misc.cpp 2009-02-15 18:07:29 UTC (rev 3639) @@ -1,35 +1,35 @@ -/* - * Acness 2D Engine - Misc - * Copyright (C) Acness <[email protected]> - * - * 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, 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. - */ - -#include "../include/misc.h" - -/** - * \brief Get the current cpu tick counts (in usec) - * \return The tick counts. - */ -unsigned long long int -getTickCount(void) -{ - struct timeval tv; - struct timezone tz; - - gettimeofday(&tv, &tz); - return (tv.tv_sec * 1000000 + tv.tv_usec); -} +/* + * Acness 2D Engine - Misc + * Copyright (C) Acness <[email protected]> + * + * 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, 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. + */ + +#include "../include/misc.h" + +/** + * \brief Get the current cpu tick counts (in usec) + * \return The tick counts. + */ +unsigned long long int +getTickCount(void) +{ + struct timeval tv; + struct timezone tz; + + gettimeofday(&tv, &tz); + return (tv.tv_sec * 1000000 + tv.tv_usec); +} Modified: software_suite_v2/tuxware/tuxosl-ose/trunk/src/mixer.cpp =================================================================== --- software_suite_v2/tuxware/tuxosl-ose/trunk/src/mixer.cpp 2009-02-15 18:01:40 UTC (rev 3638) +++ software_suite_v2/tuxware/tuxosl-ose/trunk/src/mixer.cpp 2009-02-15 18:07:29 UTC (rev 3639) @@ -1,4 +1,4 @@ -/* +/* * Tux OSL - mixer * Copyright (C) 2009 C2ME Sa <[email protected]> * Modified: software_suite_v2/tuxware/tuxosl-ose/trunk/src/profiler.cpp =================================================================== --- software_suite_v2/tuxware/tuxosl-ose/trunk/src/profiler.cpp 2009-02-15 18:01:40 UTC (rev 3638) +++ software_suite_v2/tuxware/tuxosl-ose/trunk/src/profiler.cpp 2009-02-15 18:07:29 UTC (rev 3639) @@ -1,179 +1,179 @@ -/* - * Acness 2D Engine - Profiler - * Copyright (C) Acness <[email protected]> - * - * 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, 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. - */ - -#include <stdio.h> -#include <string.h> - -#include "../include/profiler.h" -#include "../include/misc.h" - -/** - * \brief Constructor. - * \param outputFilename Output filename for the statistic results. - */ -engineProfiler::engineProfiler(const char *outputFilename) -{ - _sectionsCount = 0; - strcpy(_outputFilename, outputFilename); -} - -/** - * \brief Destructor. - */ -engineProfiler::~engineProfiler() -{ - computeStats(); - if (_sectionsCount) - { - for (int i = 0; i < _sectionsCount; i++) - { - delete _sectionsList[i]; - } - } -} - -/** - * \brief Add a new profiler section. - * \param sectionName Section name. - */ -void -engineProfiler::addNewSection(const char *sectionName) -{ - if (getSectionIdFromName(sectionName) == -1) - { - _sectionsList[_sectionsCount] = new profilerSectionInfo; - strcpy(_sectionsList[_sectionsCount]->name, sectionName); - _sectionsList[_sectionsCount]->isStarted = false; - _sectionsList[_sectionsCount]->callsCount = 0; - _sectionsList[_sectionsCount]->timeSum = 0; - _sectionsCount++; - } -} - -/** - * \brief Begin section. - * \param sectionName Section name. - */ -void -engineProfiler::sectionBegin(const char *sectionName) -{ - int sectionId = getSectionIdFromName(sectionName); - if (sectionId >= 0) - { - if (!_sectionsList[sectionId]->isStarted) - { - _sectionsList[sectionId]->isStarted = true; - _sectionsList[sectionId]->previousTime = getTickCount(); - } - } -} - -/** - * \brief End section. - * \param sectionName Section name. - */ -void -engineProfiler::sectionEnd(const char *sectionName) -{ - int sectionId = getSectionIdFromName(sectionName); - if (sectionId >= 0) - { - if (_sectionsList[sectionId]->isStarted) - { - _sectionsList[sectionId]->callsCount++; - _sectionsList[sectionId]->timeSum += (getTickCount() - - _sectionsList[sectionId]->previousTime); - _sectionsList[sectionId]->isStarted = false; - } - } -} - -/** - * \brief Get the registred section Id from its name. - * \param sectionName Section name. - * \return The section Id or -1. - */ -int -engineProfiler::getSectionIdFromName(const char *sectionName) -{ - if (!_sectionsCount) - { - return -1; - } - for (int i = 0; i < _sectionsCount; i++) - { - if (!strcmp(sectionName, _sectionsList[i]->name)) - { - return i; - } - } - return -1; -} - -/** - * \brief Compute the profiler stats and write it to file. - */ -void -engineProfiler::computeStats() -{ - unsigned long long int globalTime = 0; - float pCent; - FILE *f; - - if (!_sectionsCount) - { - return; - } - for (int i = 0; i < _sectionsCount; i++) - { - globalTime += _sectionsList[i]->timeSum; - } - if (!globalTime) - { - return; - } - f = fopen(_outputFilename, "wb"); - if (f == NULL) - { - return; - } - fprintf(f, "Profiler summary:\n"); - fprintf(f, "----------------------------------------"); - fprintf(f, "----------------------------------------\n"); - fprintf(f, "%% t(ms) calls tbc(ms) section\n"); - fprintf(f, "----------------------------------------"); - fprintf(f, "----------------------------------------\n"); - for (int i = 0; i < _sectionsCount; i++) - { - pCent = (float)_sectionsList[i]->timeSum / (float)globalTime; - pCent *= 100.; - fprintf(f, "[%7.3f] [%9.3f] [%6d] [%9.3f] [%s]\n", - pCent, - (float)_sectionsList[i]->timeSum / 1000., - (int)_sectionsList[i]->callsCount, - (float)_sectionsList[i]->timeSum / (float)_sectionsList[i]->callsCount - / 1000., - _sectionsList[i]->name - ); - } - fprintf(f, "----------------------------------------"); - fprintf(f, "----------------------------------------"); - fclose(f); -} +/* + * Acness 2D Engine - Profiler + * Copyright (C) Acness <[email protected]> + * + * 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, 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. + */ + +#include <stdio.h> +#include <string.h> + +#include "../include/profiler.h" +#include "../include/misc.h" + +/** + * \brief Constructor. + * \param outputFilename Output filename for the statistic results. + */ +engineProfiler::engineProfiler(const char *outputFilename) +{ + _sectionsCount = 0; + strcpy(_outputFilename, outputFilename); +} + +/** + * \brief Destructor. + */ +engineProfiler::~engineProfiler() +{ + computeStats(); + if (_sectionsCount) + { + for (int i = 0; i < _sectionsCount; i++) + { + delete _sectionsList[i]; + } + } +} + +/** + * \brief Add a new profiler section. + * \param sectionName Section name. + */ +void +engineProfiler::addNewSection(const char *sectionName) +{ + if (getSectionIdFromName(sectionName) == -1) + { + _sectionsList[_sectionsCount] = new profilerSectionInfo; + strcpy(_sectionsList[_sectionsCount]->name, sectionName); + _sectionsList[_sectionsCount]->isStarted = false; + _sectionsList[_sectionsCount]->callsCount = 0; + _sectionsList[_sectionsCount]->timeSum = 0; + _sectionsCount++; + } +} + +/** + * \brief Begin section. + * \param sectionName Section name. + */ +void +engineProfiler::sectionBegin(const char *sectionName) +{ + int sectionId = getSectionIdFromName(sectionName); + if (sectionId >= 0) + { + if (!_sectionsList[sectionId]->isStarted) + { + _sectionsList[sectionId]->isStarted = true; + _sectionsList[sectionId]->previousTime = getTickCount(); + } + } +} + +/** + * \brief End section. + * \param sectionName Section name. + */ +void +engineProfiler::sectionEnd(const char *sectionName) +{ + int sectionId = getSectionIdFromName(sectionName); + if (sectionId >= 0) + { + if (_sectionsList[sectionId]->isStarted) + { + _sectionsList[sectionId]->callsCount++; + _sectionsList[sectionId]->timeSum += (getTickCount() - + _sectionsList[sectionId]->previousTime); + _sectionsList[sectionId]->isStarted = false; + } + } +} + +/** + * \brief Get the registred section Id from its name. + * \param sectionName Section name. + * \return The section Id or -1. + */ +int +engineProfiler::getSectionIdFromName(const char *sectionName) +{ + if (!_sectionsCount) + { + return -1; + } + for (int i = 0; i < _sectionsCount; i++) + { + if (!strcmp(sectionName, _sectionsList[i]->name)) + { + return i; + } + } + return -1; +} + +/** + * \brief Compute the profiler stats and write it to file. + */ +void +engineProfiler::computeStats() +{ + unsigned long long int globalTime = 0; + float pCent; + FILE *f; + + if (!_sectionsCount) + { + return; + } + for (int i = 0; i < _sectionsCount; i++) + { + globalTime += _sectionsList[i]->timeSum; + } + if (!globalTime) + { + return; + } + f = fopen(_outputFilename, "wb"); + if (f == NULL) + { + return; + } + fprintf(f, "Profiler summary:\n"); + fprintf(f, "----------------------------------------"); + fprintf(f, "----------------------------------------\n"); + fprintf(f, "%% t(ms) calls tbc(ms) section\n"); + fprintf(f, "----------------------------------------"); + fprintf(f, "----------------------------------------\n"); + for (int i = 0; i < _sectionsCount; i++) + { + pCent = (float)_sectionsList[i]->timeSum / (float)globalTime; + pCent *= 100.; + fprintf(f, "[%7.3f] [%9.3f] [%6d] [%9.3f] [%s]\n", + pCent, + (float)_sectionsList[i]->timeSum / 1000., + (int)_sectionsList[i]->callsCount, + (float)_sectionsList[i]->timeSum / (float)_sectionsList[i]->callsCount + / 1000., + _sectionsList[i]->name + ); + } + fprintf(f, "----------------------------------------"); + fprintf(f, "----------------------------------------"); + fclose(f); +} Modified: software_suite_v2/tuxware/tuxosl-ose/trunk/src/wav_player.cpp =================================================================== --- software_suite_v2/tuxware/tuxosl-ose/trunk/src/wav_player.cpp 2009-02-15 18:01:40 UTC (rev 3638) +++ software_suite_v2/tuxware/tuxosl-ose/trunk/src/wav_player.cpp 2009-02-15 18:07:29 UTC (rev 3639) @@ -1,4 +1,4 @@ -/* +/* * Tux OSL - wav player * Copyright (C) 2009 C2ME Sa <[email protected]> * Modified: software_suite_v2/tuxware/tuxosl-ose/trunk/src/win32/miscCompat.cpp =================================================================== --- software_suite_v2/tuxware/tuxosl-ose/trunk/src/win32/miscCompat.cpp 2009-02-15 18:01:40 UTC (rev 3638) +++ software_suite_v2/tuxware/tuxosl-ose/trunk/src/win32/miscCompat.cpp 2009-02-15 18:07:29 UTC (rev 3639) @@ -1,70 +1,70 @@ -/* - * Acness 2D Engine - Misc Compatibility - * Copyright (C) Acness <[email protected]> - * - * 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, 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. - */ - -#include <stdio.h> -#include <time.h> - -#include "../../include/win32/miscCompat.h" - -#if defined(_MSC_VER) || defined(_MSC_EXTENSIONS) -# define DELTA_EPOCH_IN_MICROSECS 11644473600000000Ui64 -#else -# define DELTA_EPOCH_IN_MICROSECS 11644473600000000ULL -#endif - -/** - * \brief Get the time of the day. - * Missing function on windows. - */ -int -gettimeofday(struct timeval *tv, struct timezone *tz) -{ - FILETIME ft; - unsigned __int64 tmpres = 0; - static int tzflag; - - if (NULL != tv) - { - GetSystemTimeAsFileTime(&ft); - - tmpres |= ft.dwHighDateTime; - tmpres <<= 32; - tmpres |= ft.dwLowDateTime; - - /*converting file time to unix epoch*/ - tmpres -= DELTA_EPOCH_IN_MICROSECS; - tmpres /= 10; /*convert into microseconds*/ - tv->tv_sec = (long)(tmpres / 1000000UL); - tv->tv_usec = (long)(tmpres % 1000000UL); - } - - if (NULL != tz) - { - if (!tzflag) - { - _tzset(); - tzflag++; - } - tz->tz_minuteswest = _timezone / 60; - tz->tz_dsttime = _daylight; - } - - return 0; -} +/* + * Acness 2D Engine - Misc Compatibility + * Copyright (C) Acness <[email protected]> + * + * 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, 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. + */ + +#include <stdio.h> +#include <time.h> + +#include "../../include/win32/miscCompat.h" + +#if defined(_MSC_VER) || defined(_MSC_EXTENSIONS) +# define DELTA_EPOCH_IN_MICROSECS 11644473600000000Ui64 +#else +# define DELTA_EPOCH_IN_MICROSECS 11644473600000000ULL +#endif + +/** + * \brief Get the time of the day. + * Missing function on windows. + */ +int +gettimeofday(struct timeval *tv, struct timezone *tz) +{ + FILETIME ft; + unsigned __int64 tmpres = 0; + static int tzflag; + + if (NULL != tv) + { + GetSystemTimeAsFileTime(&ft); + + tmpres |= ft.dwHighDateTime; + tmpres <<= 32; + tmpres |= ft.dwLowDateTime; + + /*converting file time to unix epoch*/ + tmpres -= DELTA_EPOCH_IN_MICROSECS; + tmpres /= 10; /*convert into microseconds*/ + tv->tv_sec = (long)(tmpres / 1000000UL); + tv->tv_usec = (long)(tmpres % 1000000UL); + } + + if (NULL != tz) + { + if (!tzflag) + { + _tzset(); + tzflag++; + } + tz->tz_minuteswest = _timezone / 60; + tz->tz_dsttime = _daylight; + } + + return 0; +} Modified: software_suite_v2/tuxware/tuxosl-ose/trunk/src/win32/playback.cpp =================================================================== --- software_suite_v2/tuxware/tuxosl-ose/trunk/src/win32/playback.cpp 2009-02-15 18:01:40 UTC (rev 3638) +++ software_suite_v2/tuxware/tuxosl-ose/trunk/src/win32/playback.cpp 2009-02-15 18:07:29 UTC (rev 3639) @@ -1,4 +1,4 @@ -/* +/* * Tux OSL - playback - Portaudio interface for win32 * Copyright (C) 2009 C2ME Sa <[email protected]> * Modified: software_suite_v2/tuxware/tuxosl-ose/trunk/test/main.cpp =================================================================== --- software_suite_v2/tuxware/tuxosl-ose/trunk/test/main.cpp 2009-02-15 18:01:40 UTC (rev 3638) +++ software_suite_v2/tuxware/tuxosl-ose/trunk/test/main.cpp 2009-02-15 18:07:29 UTC (rev 3639) @@ -1,4 +1,4 @@ -/* +/* * Tux OSL - Test * Copyright (C) 2009 C2ME Sa <[email protected]> * @@ -56,6 +56,6 @@ sleep(1); playback.stop(); - + return 0; } ------------------------------------------------------------------------------ Open Source Business Conference (OSBC), March 24-25, 2009, San Francisco, CA -OSBC tackles the biggest issue in open source: Open Sourcing the Enterprise -Strategies to boost innovation and cut costs with open source participation -Receive a $600 discount off the registration fee with the source code: SFAD http://p.sf.net/sfu/XcvMzF8H _______________________________________________ Tux-droid-svn mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/tux-droid-svn
