[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Enigma-cvs] enigma/src video.cc,1.11,1.12 video.hh,1.4,1.5
From: |
Ralf Westram <address@hidden> |
Subject: |
[Enigma-cvs] enigma/src video.cc,1.11,1.12 video.hh,1.4,1.5 |
Date: |
Sun, 09 Nov 2003 11:53:38 +0000 |
Update of /cvsroot/enigma/enigma/src
In directory subversions:/tmp/cvs-serv659/src
Modified Files:
video.cc video.hh
Log Message:
- added GetCaption
Index: video.cc
===================================================================
RCS file: /cvsroot/enigma/enigma/src/video.cc,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** video.cc 27 Oct 2003 11:51:17 -0000 1.11
--- video.cc 9 Nov 2003 11:53:36 -0000 1.12
***************
*** 62,65 ****
--- 62,66 ----
bool is_fullscreen() const { return fullScreen; }
void set_caption(const char *str);
+ const string& get_caption() const { return caption; }
px::Screen *get_screen() { return screen; }
};
***************
*** 115,118 ****
--- 116,120 ----
void Video_SDL::set_caption(const char *str) {
+ caption = str;
if (initialized)
SDL_WM_SetCaption(str, 0);
***************
*** 373,376 ****
--- 375,381 ----
void video::SetCaption(const char *str) {
video_engine->set_caption(str);
+ }
+ const string& video::GetCaption() {
+ return video_engine->get_caption();
}
Index: video.hh
===================================================================
RCS file: /cvsroot/enigma/enigma/src/video.hh,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** video.hh 20 Oct 2003 08:05:46 -0000 1.4
--- video.hh 9 Nov 2003 11:53:36 -0000 1.5
***************
*** 6,10 ****
* 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
--- 6,10 ----
* 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
***************
*** 22,27 ****
#define VIDEO_HH_INCLUDED
! #include "SDL.h"
! #include "px/pxfwd.hh"
namespace video
--- 22,34 ----
#define VIDEO_HH_INCLUDED
! #ifndef STRING
! # include <string>
! #endif
! #ifndef _SDL_H
! # include "SDL.h"
! #endif
! #ifndef PXFWD_HH
! # include "px/pxfwd.hh"
! #endif
namespace video
***************
*** 55,60 ****
fullscreen mode is active afterwards. */
bool ToggleFullscreen();
!
void SetCaption(const char *str);
void SetPalette(const char *palname);
--- 62,68 ----
fullscreen mode is active afterwards. */
bool ToggleFullscreen();
!
void SetCaption(const char *str);
+ const std::string& GetCaption();
void SetPalette(const char *palname);
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Enigma-cvs] enigma/src video.cc,1.11,1.12 video.hh,1.4,1.5,
Ralf Westram <address@hidden> <=
- Prev by Date:
[Enigma-cvs] enigma/src d_statusbar.hh,1.9,1.10
- Next by Date:
[Enigma-cvs] enigma/data/levels duffy9.lua, 1.2, 1.3 duffy8.lua, 1.1, 1.2 duffy7.lua, 1.2, 1.3 duffy6.lua, 1.2, 1.3 duffy5.lua, 1.1, 1.2 duffy4.lua, 1.1, 1.2 duffy35.lua, 1.1, 1.2 duffy34.lua, 1.1, 1.2 duffy33.lua, 1.1, 1.2 duffy32.lua, 1.1, 1.2 duffy31.lua, 1.1, 1.2 duffy30.lua, 1.1, 1.2 duffy3.lua, 1.1, 1.2 duffy29.lua, 1.1, 1.2 duffy28.lua, 1.1, 1.2 duffy27.lua, 1.1, 1.2 duffy26.lua, 1.2, 1.3 duffy25.lua, 1.1, 1.2 duffy24.lua, 1.1, 1.2 duffy23.lua, 1.2, 1.3 duffy22.lua, 1.2, 1.3 duffy21.lua, 1.1, 1.2 duffy20.lua, 1.1, 1.2 duffy2.lua, 1.1, 1.2 duffy19.lua, 1.1, 1.2 duffy18.lua, 1.1, 1.2 duffy17.lua, 1.2, 1.3 duffy16.lua, 1.1, 1.2 duffy15.lua, 1.3, 1.4 duffy14.lua, 1.2, 1.3 duffy13.lua, 1.3, 1.4 duffy12.lua, 1.2, 1.3 duffy11.lua, 1.2, 1.3 duffy10.lua, 1.1, 1.2 duffy1.lua, 1.2, 1.3
- Previous by thread:
[Enigma-cvs] enigma/src d_statusbar.hh,1.9,1.10
- Next by thread:
[Enigma-cvs] enigma/data/levels duffy9.lua, 1.2, 1.3 duffy8.lua, 1.1, 1.2 duffy7.lua, 1.2, 1.3 duffy6.lua, 1.2, 1.3 duffy5.lua, 1.1, 1.2 duffy4.lua, 1.1, 1.2 duffy35.lua, 1.1, 1.2 duffy34.lua, 1.1, 1.2 duffy33.lua, 1.1, 1.2 duffy32.lua, 1.1, 1.2 duffy31.lua, 1.1, 1.2 duffy30.lua, 1.1, 1.2 duffy3.lua, 1.1, 1.2 duffy29.lua, 1.1, 1.2 duffy28.lua, 1.1, 1.2 duffy27.lua, 1.1, 1.2 duffy26.lua, 1.2, 1.3 duffy25.lua, 1.1, 1.2 duffy24.lua, 1.1, 1.2 duffy23.lua, 1.2, 1.3 duffy22.lua, 1.2, 1.3 duffy21.lua, 1.1, 1.2 duffy20.lua, 1.1, 1.2 duffy2.lua, 1.1, 1.2 duffy19.lua, 1.1, 1.2 duffy18.lua, 1.1, 1.2 duffy17.lua, 1.2, 1.3 duffy16.lua, 1.1, 1.2 duffy15.lua, 1.3, 1.4 duffy14.lua, 1.2, 1.3 duffy13.lua, 1.3, 1.4 duffy12.lua, 1.2, 1.3 duffy11.lua, 1.2, 1.3 duffy10.lua, 1.1, 1.2 duffy1.lua, 1.2, 1.3
- Index(es):