generic-pc: initialize GL framebuffer in init()

Origin commit data
------------------
Branch: master
Commit: ae9d6fd668
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-05-04 (Sat, 04 May 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
Stefan Seyfried
2013-05-04 12:30:23 +02:00
parent 41d3436ebf
commit b4f93b6fd8
3 changed files with 21 additions and 0 deletions

View File

@@ -33,6 +33,14 @@ if BOXTYPE_GENERIC
SUBDIRS += generic-pc SUBDIRS += generic-pc
libstb_hal_la_LIBADD += \ libstb_hal_la_LIBADD += \
generic-pc/libgeneric.la generic-pc/libgeneric.la
libstb_hal_test_LDADD += \
-lglut -lGL -lGLU -lGLEW \
-lOpenThreads \
@AVFORMAT_LIBS@ \
@AVUTIL_LIBS@ \
@AVCODEC_LIBS@ \
@SWSCALE_LIBS@
endif endif
if BOXTYPE_SPARK if BOXTYPE_SPARK
SUBDIRS += libspark libeplayer3 SUBDIRS += libspark libeplayer3

View File

@@ -22,6 +22,12 @@ if test x"$BOXTYPE" = x"tripledragon"; then
TUXBOX_APPS_LIB_PKGCONFIG(DIRECTFB, directfb) TUXBOX_APPS_LIB_PKGCONFIG(DIRECTFB, directfb)
fi fi
if test x$BOXTYPE = xgeneric; then
TUXBOX_APPS_LIB_PKGCONFIG(AVFORMAT,libavformat)
TUXBOX_APPS_LIB_PKGCONFIG(AVCODEC,libavcodec)
TUXBOX_APPS_LIB_PKGCONFIG(AVUTIL,libavutil)
TUXBOX_APPS_LIB_PKGCONFIG(SWSCALE,libswscale)
fi
AC_OUTPUT([ AC_OUTPUT([
Makefile Makefile
common/Makefile common/Makefile

View File

@@ -1,21 +1,28 @@
#include <unistd.h> #include <unistd.h>
#include "init_lib.h" #include "init_lib.h"
#include "lt_debug.h" #include "lt_debug.h"
#include "glfb.h"
#define lt_debug(args...) _lt_debug(TRIPLE_DEBUG_INIT, NULL, args) #define lt_debug(args...) _lt_debug(TRIPLE_DEBUG_INIT, NULL, args)
#define lt_info(args...) _lt_info(TRIPLE_DEBUG_INIT, NULL, args) #define lt_info(args...) _lt_info(TRIPLE_DEBUG_INIT, NULL, args)
static bool initialized = false; static bool initialized = false;
GLFramebuffer *glfb = NULL;
void init_td_api() void init_td_api()
{ {
if (!initialized) if (!initialized)
lt_debug_init(); lt_debug_init();
lt_info("%s begin, initialized=%d, debug=0x%02x\n", __func__, (int)initialized, debuglevel); lt_info("%s begin, initialized=%d, debug=0x%02x\n", __func__, (int)initialized, debuglevel);
if (! glfb)
glfb = new GLFramebuffer(720, 576); /* hard coded to PAL resolution for now */
initialized = true; initialized = true;
} }
void shutdown_td_api() void shutdown_td_api()
{ {
lt_info("%s, initialized = %d\n", __func__, (int)initialized); lt_info("%s, initialized = %d\n", __func__, (int)initialized);
if (glfb)
delete glfb;
initialized = false; initialized = false;
} }