[Gnash-commit] gnash ChangeLog libbase/Makefile.am libbase/tu_...

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  08/06/09 08:43:56

Modified files:
        .              : ChangeLog 
        libbase        : Makefile.am 
Removed files:
        libbase        : tu_file_SDL.cpp 

Log message:
        drop unused tu_file_SDL.cpp.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.6858&r2=1.6859
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/Makefile.am?cvsroot=gnash&r1=1.116&r2=1.117
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/tu_file_SDL.cpp?cvsroot=gnash&r1=1.3&r2=0

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.6858
retrieving revision 1.6859
diff -u -b -r1.6858 -r1.6859
--- ChangeLog   9 Jun 2008 08:15:11 -0000       1.6858
+++ ChangeLog   9 Jun 2008 08:43:55 -0000       1.6859
@@ -1,5 +1,9 @@
 2008-06-09 Sandro Santilli <address@hidden>
 
+       * libbase/: Makefile.am, tu_file_SDL.cpp: drop unused file.
+
+2008-06-09 Sandro Santilli <address@hidden>
+
        * server/swf/tag_loaders.cpp: document need for tu_file.h include.
        * server/parser/shape_character_def.cpp: drop tu_file.h include.
 

Index: libbase/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/libbase/Makefile.am,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -b -r1.116 -r1.117
--- libbase/Makefile.am 3 Jun 2008 12:39:52 -0000       1.116
+++ libbase/Makefile.am 9 Jun 2008 08:43:56 -0000       1.117
@@ -56,7 +56,6 @@
        $(PTHREAD_CFLAGS) \
        $(LIBXML_CFLAGS) \
        $(PNG_CFLAGS) \
-       $(SDL_CFLAGS) \
        $(GLIB_CFLAGS) \
        $(GSTREAMER_CFLAGS) \
        $(CURL_CFLAGS) \
@@ -85,13 +84,6 @@
        $(PTHREAD_LIBS) \
        $(NULL)
 
-if HAVE_SDL
-SDL_FILE = tu_file_SDL.cpp
-libgnashbase_la_LIBADD += $(SDL_LIBS)
-else
-EXTRA_DIST += tu_file_SDL.cpp 
-endif
-
 # Maybe use jemalloc, which handles memory fragmentation for
 # ECAMscript languages better than the regular system malloc.
 # This is controlled by the --enable-jemalloc (disabled by default)
@@ -115,7 +107,6 @@
        sharedlib.cpp \
        string_table.cpp \
        tu_file.cpp \
-       $(SDL_FILE) \
        ClockTime.cpp \
        WallClockTimer.cpp \
        utf8.cpp \

Index: libbase/tu_file_SDL.cpp
===================================================================
RCS file: libbase/tu_file_SDL.cpp
diff -N libbase/tu_file_SDL.cpp
--- libbase/tu_file_SDL.cpp     30 Mar 2006 19:12:53 -0000      1.3
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,120 +0,0 @@
-// tu_file_SDL.cpp     -- Ignacio Castaño, Thatcher Ulrich <address@hidden> 
2003
-
-// This source code has been donated to the Public Domain.  Do
-// whatever you want with it.
-
-// tu_file constructor, for creating a tu_file from an SDL_RWops*
-// stream.  In its own source file so that if clients of the base
-// library don't call it, it won't get pulled in by the linker and
-// won't try to link with SDL.
-
-
-#include "tu_file.h"
-#include "utility.h"
-#include <SDL.h>
-
-
-// TODO: add error detection and reporting!!!
-
-static int sdl_read_func(void* dst, int bytes, void* appdata) 
-{
-       assert(dst);
-       assert(appdata);
-       int     result = SDL_RWread((SDL_RWops*) appdata, dst, 1, bytes);
-       if (result == -1)
-       {
-               // @@ set appdata->m_error?
-               return 0;
-       }
-       return result;
-}
-
-static int sdl_write_func(const void* src, int bytes, void* appdata)
-{
-       assert(src);
-       assert(appdata);
-       int     result = SDL_RWwrite((SDL_RWops*) appdata, src, 1, bytes);
-       if (result == -1)
-       {
-               // @@ set m_errer?
-               return 0;
-       }
-       return result;
-}
-
-static int sdl_seek_func(int pos, void *appdata)
-{
-       assert(pos >= 0);
-       assert(appdata);
-       return SDL_RWseek((SDL_RWops*) appdata, pos, SEEK_SET);
-}
-
-static int sdl_seek_to_end_func(void *appdata)
-{
-       assert(appdata);
-       return SDL_RWseek((SDL_RWops*) appdata, 0, SEEK_END);
-}
-
-static int sdl_tell_func(void *appdata)
-{
-       assert(appdata);
-       return SDL_RWtell((SDL_RWops*) appdata);
-}
-
-static bool sdl_get_eof_func(void* appdata)
-{
-       assert(appdata);
-
-       int     cur_pos = sdl_tell_func(appdata);
-       sdl_seek_to_end_func(appdata);
-       int     end_pos = sdl_tell_func(appdata);
-       if (end_pos <= cur_pos)
-       {
-               return true;
-       }
-       else
-       {
-               sdl_seek_func(cur_pos, appdata);
-               return false;
-       }
-}
-
-static int sdl_close_func(void *appdata)
-{
-       assert(appdata);
-       int     result = SDL_RWclose((SDL_RWops*) appdata);
-       if (result != 0)
-       {
-               return TU_FILE_CLOSE_ERROR;
-       }
-       return 0;
-}
-
-       
-tu_file::tu_file(SDL_RWops* sdl_stream, bool autoclose)
-// Create a tu_file object that can be used to read/write stuff.  Use
-// an SDL_RWops* as the underlying implementation.
-//
-// If autoclose is true, then the sdl_stream has SDL_RWclose()
-// called on it when the resulting file object is destructed.
-{
-       assert(sdl_stream);
-
-       m_data = (void*) sdl_stream;
-       m_read = sdl_read_func;
-       m_write = sdl_write_func;
-       m_seek = sdl_seek_func;
-       m_seek_to_end = sdl_seek_to_end_func;
-       m_tell = sdl_tell_func;
-       m_get_eof = sdl_get_eof_func;
-       m_close = autoclose ? sdl_close_func : NULL;
-       m_error = TU_FILE_NO_ERROR;
-}
-
-
-// Local Variables:
-// mode: C++
-// c-basic-offset: 8 
-// tab-width: 8
-// indent-tabs-mode: t
-// End: