[Gnash-commit] /srv/bzr/gnash/trunk r9529: Kill zombie files.

[Benjamin Wolsey]

------------------------------------------------------------
revno: 9529
committer: Benjamin Wolsey <address@hidden>
branch nick: trunk
timestamp: Wed 2008-07-23 20:17:53 +0200
message:
  Kill zombie files.
removed:
  libbase/test_ogl.cpp
  libbase/tu_file_SDL.cpp
    ------------------------------------------------------------
    revno: 9526.2.1
    committer: Benjamin Wolsey <address@hidden>
    branch nick: work
    timestamp: Wed 2008-07-23 20:17:04 +0200
    message:
      Drop these files again. They were dead, but bzr seems to have brought 
them back.
    removed:
      libbase/test_ogl.cpp
      libbase/tu_file_SDL.cpp

=== removed file 'libbase/test_ogl.cpp'
--- a/libbase/test_ogl.cpp      2006-08-28 10:07:14 +0000
+++ b/libbase/test_ogl.cpp      1970-01-01 00:00:00 +0000
@@ -1,42 +0,0 @@
-// ogl.cpp     -- by Thatcher Ulrich <address@hidden>
-
-// This source code has been donated to the Public Domain.  Do
-// whatever you want with it.
-
-// test program for ogl wrapper
-
-
-#include <cstdlib> //For exit()
-#include "ogl.h"
-#include <SDL.h>
-
-
-#undef main    // SDL weirdness under WIN32!!
-extern "C" int main(int argc, char *argv[])
-{
-       if (SDL_Init(SDL_INIT_VIDEO /* | SDL_INIT_JOYSTICK | SDL_INIT_CDROM | 
SDL_INIT_AUDIO*/))
-       {
-               fprintf(stderr, "Unable to init SDL: %s\n", SDL_GetError());
-               exit(1);
-       }
-       atexit(SDL_Quit);
-
-       int     bpp = 24;
-       int     flags = SDL_OPENGL | (0 ? SDL_FULLSCREEN : 0);
-
-       SDL_GL_SetAttribute( SDL_GL_RED_SIZE, 5 );
-       SDL_GL_SetAttribute( SDL_GL_GREEN_SIZE, 5 );
-       SDL_GL_SetAttribute( SDL_GL_BLUE_SIZE, 5 );
-       SDL_GL_SetAttribute( SDL_GL_DEPTH_SIZE, 16 );
-       SDL_GL_SetAttribute( SDL_GL_DOUBLEBUFFER, 1 );
-
-       // Set the video mode.
-       if (SDL_SetVideoMode(320, 240, bpp, flags) == 0) {
-               fprintf(stderr, "SDL_SetVideoMode() failed.");
-               exit(1);
-       }
-
-       ogl::open();
-
-       return 0;
-}

=== removed file 'libbase/tu_file_SDL.cpp'
--- a/libbase/tu_file_SDL.cpp   2006-03-30 18:12:51 +0000
+++ b/libbase/tu_file_SDL.cpp   1970-01-01 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: