ichthyo/LUMIERA.clone
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

keep the display handles within a separate header

Browse source
This commit is contained in:
Fischlurch 2009-02-09 05:43:55 +01:00
parent ebf625acae
commit 0e5314e0cf
7 changed files with 67 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/gui/Makefile.am
View file

@ -56,6 +56,7 @@ gtk_gui_la_SOURCES = \
$(lumigui_srcdir)/gtk-lumiera.cpp \
$(lumigui_srcdir)/gtk-lumiera.hpp \
$(lumigui_srcdir)/notification-service.cpp \
$(lumigui_srcdir)/display-service.cpp \
$(lumigui_srcdir)/window-manager.cpp \
$(lumigui_srcdir)/window-manager.hpp \
$(lumigui_srcdir)/workspace/actions.cpp \

2
src/gui/display-service.cpp
View file

@ -228,7 +228,7 @@ namespace gui {
DisplayerSlot::DisplayerSlot (FrameDestination const& outputDestination)
: currBuffer_(0)
: currBuffer_(0)
{
put_ = 0; // mark as not allocated
hasFrame_.connect (outputDestination);

15
src/include/display-facade.h
View file

@ -1,5 +1,5 @@
/*
DISPLAY-FACADE.hpp - accessing a display for outputting frames
DISPLAY-FACADE.h - accessing a display for outputting frames
Copyright (C) Lumiera.org
2009, Hermann Vosseler <Ichthyostega@web.de>
@ -20,7 +20,7 @@
*/
/** @file display-facade.hpp
/** @file display-facade.h
** Major public Interface of the Lumiera GUI. While, generally speaking, the GUI
** controls the application and thus acts on its own, it exposes some services
** to the lower layers. Especially the lumiera::Display interface serves to
@ -37,18 +37,9 @@
#ifndef GUI_INTERFACE_DISPLAY_H
#define GUI_INTERFACE_DISPLAY_H
#include "include/display-handles.h"
typedef unsigned char * LumieraDisplayFrame;
struct lumiera_displaySlot_struct
{
void (*put_)(lumiera_displaySlot_struct*, LumieraDisplayFrame);
};
typedef struct lumiera_displaySlot_struct lumiera_displaySlot;
typedef lumiera_displaySlot* LumieraDisplaySlot;

55
src/include/display-handles.h Normal file
View file

@ -0,0 +1,55 @@
/*
DISPLAY-HANDLES.h - opaque handle types for playback and display
Copyright (C) Lumiera.org
2009, Hermann Vosseler <Ichthyostega@web.de>
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 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., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
/** @file display-handles.hpp
** Opaque handles and similar typedefs used to communicate via the
** lumiera::Display and lumiera::DummyPlayer facade interfaces.
**
** @see gui::DisplayService
**
*/
#ifndef LUMIERA_DISPLAY_HANDLES_H
#define LUMIERA_DISPLAY_HANDLES_H
typedef unsigned char * LumieraDisplayFrame;
struct lumiera_displaySlot_struct
{
void (*put_)(lumiera_displaySlot_struct*, LumieraDisplayFrame);
};
typedef struct lumiera_displaySlot_struct lumiera_displaySlot;
typedef lumiera_displaySlot* LumieraDisplaySlot;
struct lumiera_playprocess_struct { };
typedef struct lumiera_playprocess_struct lumiera_playprocess;
typedef lumiera_playprocess* LumieraPlayProcess;
#endif

9
src/include/dummy-player-facade.h
View file

@ -1,5 +1,5 @@
/*
DUMMY-PLAYER-FACADE.hpp - access point to a dummy test player
DUMMY-PLAYER-FACADE.h - access point to a dummy test player
Copyright (C) Lumiera.org
2009, Hermann Vosseler <Ichthyostega@web.de>
@ -25,12 +25,7 @@
#define PROC_INTERFACE_DUMMYPLAYER_H
#include "include/display-facade.h"
struct lumiera_playprocess_struct { };
typedef struct lumiera_playprocess_struct lumiera_playprocess;
typedef lumiera_playprocess* LumieraPlayProcess;
#include "include/display-handles.h"

5
src/include/guinotification-facade.h
View file

@ -1,5 +1,5 @@
/*
GUINOTIFICATIONFACADE.hpp - access point for pushing informations into the GUI
GUINOTIFICATION-FACADE.h - access point for pushing informations into the GUI
Copyright (C) Lumiera.org
2008, Hermann Vosseler <Ichthyostega@web.de>
@ -20,7 +20,7 @@
*/
/** @file guinotification-facade.hpp
/** @file guinotification-facade.h
** Major public Interface of the Lumiera GUI. While generally speaking, the GUI
** controls the application and thus acts on its own, it exposes some services
** usable by scripts or the two lower layers. The main purpose of these services
@ -35,6 +35,7 @@
#define GUI_GUINOTIFICATION_H
#ifdef __cplusplus /* ============== C++ Interface ================= */
#include "include/interfaceproxy.hpp"

4
src/proc/Makefile.am
View file

@ -24,7 +24,7 @@ noinst_LTLIBRARIES += liblumiproc.la
liblumiproc_la_CFLAGS = $(AM_CFLAGS) -std=gnu99 -Wall -Wextra -Werror
liblumiproc_la_CXXFLAGS = $(AM_CXXFLAGS) -Wall -Wextra
liblumiproc_la_SOURCES = \
liblumiproc_la_SOURCES = \
$(liblumiproc_la_srcdir)/controllerfacade.cpp \
$(liblumiproc_la_srcdir)/facade.cpp \
$(liblumiproc_la_srcdir)/state.cpp \
@ -205,7 +205,7 @@ noinst_HEADERS += \
$(liblumiproc_la_srcdir)/mobject/builderfacade.hpp \
$(liblumiproc_la_srcdir)/control/pathmanager.hpp \
$(liblumiproc_la_srcdir)/control/renderstate.hpp \
$(liblumiproc_la_srcdir)/play/dummy-player-service.cpp \
$(liblumiproc_la_srcdir)/play/tick-service.hpp \
$(liblumiproc_la_srcdir)/play/dummy-image-generator.hpp \
$(liblumiproc_la_srcdir)/mobject/interpolator.hpp \
$(liblumiproc_la_srcdir)/mobject/parameter.hpp \