[Gnash-commit] [SCM] Gnash branch, master, updated. ddf8832b4eae60d25479e435ca34ff567c6feea1

[Benjamin Wolsey]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Gnash".

The branch, master has been updated
       via  ddf8832b4eae60d25479e435ca34ff567c6feea1 (commit)
       via  2520da3b15b5ec9575afbfc6fcab864b1b6e035f (commit)
       via  fe9f9d2001d4368d13eeec41c7c802e4d2fbbc5d (commit)
       via  65973cb1fbb822cf8a6c546c7176ea160aeffbac (commit)
      from  516251ba306699fd1d64a63b7249a614509a5e1f (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit//commit/?id=ddf8832b4eae60d25479e435ca34ff567c6feea1


commit ddf8832b4eae60d25479e435ca34ff567c6feea1
Author: Benjamin Wolsey <address@hidden>
Date:   Sun Sep 19 08:33:45 2010 +0200

    Drop duplicated file.

diff --git a/libbase/lirc.h b/libbase/lirc.h
deleted file mode 100644
index 0878c83..0000000
--- a/libbase/lirc.h
+++ /dev/null
@@ -1,53 +0,0 @@
-// 
-//   Copyright (C) 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
-// 
-// 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 3 of the License, 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., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-#ifndef __LIRC_H__
-#define __LIRC_H__
-
-#include "dsodefs.h"
-#include "gnash.h"
-#include "network.h"
-#include "GnashKey.h"
-
-namespace gnash {
-
-class DSOEXPORT Lirc : public Network {
-public:
-    Lirc();
-    ~Lirc();
-    bool init();
-    bool init(const char *sockpath);
-    
-    // Whenever lircd receives a IR signal it will broadcast the
-    // following string to each client:
-    // <code> <repeat count> <button name> <remote control name>
-    gnash::key::code getKey();
-    const char *getButton();
-  private:
-    const char *_sockname;
-    char *_button;
-};
-
-} // end of gnash namespace
-
-// __LIRC_H__
-#endif
-
-// Local Variables:
-// mode: C++
-// indent-tabs-mode: t
-// End:

http://git.savannah.gnu.org/cgit//commit/?id=2520da3b15b5ec9575afbfc6fcab864b1b6e035f


commit 2520da3b15b5ec9575afbfc6fcab864b1b6e035f
Author: Benjamin Wolsey <address@hidden>
Date:   Sun Sep 19 08:32:36 2010 +0200

    Drop obsolete code.

diff --git a/gui/gtk/gtk.cpp b/gui/gtk/gtk.cpp
index e744107..bd1d84c 100644
--- a/gui/gtk/gtk.cpp
+++ b/gui/gtk/gtk.cpp
@@ -31,9 +31,6 @@
 #include "Renderer.h"
 #include "RunResources.h"
 #include "VM.h"
-#ifdef USE_LIRC
-#include "lirc.h"
-#endif
 #include "gnash.h" // Quality
 
 #include <iostream>
@@ -310,13 +307,6 @@ GtkGui::init(int argc, char **argv[])
 #endif
     gtk_widget_show(_window);
     
-#ifdef USE_LIRC
-    lirc = new Lirc();
-    if (!lirc->init("/dev/lircd")) {
-        log_debug(_("LIRC daemon not running"));
-    }
-#endif
-
 #ifdef BUILD_CANVAS
     _renderer = gnash_canvas_get_renderer(GNASH_CANVAS(_canvas));
 #else

http://git.savannah.gnu.org/cgit//commit/?id=fe9f9d2001d4368d13eeec41c7c802e4d2fbbc5d


commit fe9f9d2001d4368d13eeec41c7c802e4d2fbbc5d
Author: Benjamin Wolsey <address@hidden>
Date:   Sun Sep 19 08:32:28 2010 +0200

    Drop unused file.

diff --git a/libbase/Makefile.am b/libbase/Makefile.am
index 77e845b..bd79907 100644
--- a/libbase/Makefile.am
+++ b/libbase/Makefile.am
@@ -162,7 +162,6 @@ inst_HEADERS = \
        jemtree.h \
        GnashSleep.h \
        gmemory.h \
-       ogl.h \
        SharedMem.h \
        sharedlib.h \
        tree.hh \
diff --git a/libbase/ogl.h b/libbase/ogl.h
deleted file mode 100644
index 0b1760b..0000000
--- a/libbase/ogl.h
+++ /dev/null
@@ -1,68 +0,0 @@
-// ogl.h    -- by Thatcher Ulrich <address@hidden>
-
-// This source code has been donated to the Public Domain.  Do
-// whatever you want with it.
-
-// Some OpenGL helpers; mainly to generically deal with extensions.
-
-#ifndef OGL_H
-#define OGL_H
-
-//#include "tu_config.h"
-#include "tu_opengl_includes.h"
-
-namespace ogl
-{
-void    open();
-void    close();
-
-// Return true if the specified extension is available.
-bool    check_extension(const char* extension);
-
-// Return GL_CLAMP, or GL_CLAMP_TO_EDGE_EXT, depending on
-// which is available.  I pretty much always want the
-// GL_CLAMP_TO_EDGE_EXT behavior, but it's not in the OpenGL
-// 1.1 standard, so in those cases I must fall back to
-// GL_CLAMP.
-int    get_clamp_mode();
-
-// For allocating DMA or video memory, for holding vertex arrays.
-void*    allocate_vertex_memory( int size );    // @@ add a flag for selecting 
AGP vs. video mem?
-void    free_vertex_memory( void* buffer );
-
-// Fences; for synchronizing with the GPU.
-void    gen_fences(int count, unsigned int* fence_array);
-void    set_fence(unsigned int fence_id);
-void    finish_fence(unsigned int fence_id);
-
-// Stream operations; for pushing dynamic vertex data.
-void*    stream_get_vertex_memory(int size);
-void    stream_flush_combiners();    // do this after filling your buffer, and 
before calling glDrawElements()
-
-// Rudimentary multitexture stuff.
-void    client_active_texture(int stage);
-void    multi_tex_coord_2f(int stage, float s, float t);
-void    multi_tex_coord_2fv(int stage, float* st);
-}
-
-
-// Some old gl/gl.h files don't define these, e.g. default Windows includes.
-// It shouldn't hurt anything to call glTexEnvf() with these values on a system
-// that doesn't implement them.
-
-#ifndef GL_TEXTURE_FILTER_CONTROL_EXT
-#define GL_TEXTURE_FILTER_CONTROL_EXT 0x8500
-#endif
-
-#ifndef GL_TEXTURE_LOD_BIAS_EXT
-#define GL_TEXTURE_LOD_BIAS_EXT 0x8501
-#endif
-
-
-#endif // OGL_H
-
-
-// Local Variables:
-// mode: C++
-// indent-tabs-mode: t
-// End:

http://git.savannah.gnu.org/cgit//commit/?id=65973cb1fbb822cf8a6c546c7176ea160aeffbac


commit 65973cb1fbb822cf8a6c546c7176ea160aeffbac
Author: Benjamin Wolsey <address@hidden>
Date:   Sun Sep 19 08:21:05 2010 +0200

    Remove leftover file.

diff --git a/libbase/getopt_win32.cpp b/libbase/getopt_win32.cpp
deleted file mode 100644
index 0d478a4..0000000
--- a/libbase/getopt_win32.cpp
+++ /dev/null
@@ -1,80 +0,0 @@
-
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-
-#include <string.h>
-#include <stdio.h>
-
-  char *optarg;                        // global argument pointer
-  int optind = 0;              // global argv index
-
-       int getopt (int argc, char *const argv[], char *optstring)
-  {
-    char c;
-    char *cp;
-    static char *next = NULL;
-    if (optind == 0)
-      next = NULL;
-
-      optarg = NULL;
-
-    if (next == NULL || *next == '\0')
-      {
-       if (optind == 0)
-         optind++;
-
-       if (optind >= argc || argv[optind][0] != '-'
-           || argv[optind][1] == '\0')
-         {
-           optarg = NULL;
-           if (optind < argc)
-             optarg = argv[optind];
-           return EOF;
-         }
-
-       if (strcmp (argv[optind], "--") == 0)
-         {
-           optind++;
-           optarg = NULL;
-           if (optind < argc)
-             optarg = argv[optind];
-           return EOF;
-         }
-
-       next = argv[optind] + 1;
-       optind++;
-      }
-
-    c = *next++;
-    cp = strchr (optstring, c);
-
-    if (cp == NULL || c == ':')
-      return '?';
-
-    cp++;
-    if (*cp == ':')
-      {
-       if (*next != '\0')
-         {
-           optarg = next;
-           next = NULL;
-         }
-       else if (optind < argc)
-         {
-           optarg = argv[optind];
-           optind++;
-         }
-       else
-         {
-           return '?';
-         }
-      }
-
-    return c;
-  }
-
-#ifdef __cplusplus
-}
-#endif

-----------------------------------------------------------------------

Summary of changes:
 gui/gtk/gtk.cpp          |   10 ------
 libbase/Makefile.am      |    1 -
 libbase/getopt_win32.cpp |   80 ----------------------------------------------
 libbase/lirc.h           |   53 ------------------------------
 libbase/ogl.h            |   68 ---------------------------------------
 5 files changed, 0 insertions(+), 212 deletions(-)
 delete mode 100644 libbase/getopt_win32.cpp
 delete mode 100644 libbase/lirc.h
 delete mode 100644 libbase/ogl.h


hooks/post-receive
-- 
Gnash