summaryrefslogtreecommitdiff
path: root/src/xine-engine
diff options
context:
space:
mode:
authorJames Courtier-Dutton <jcdutton@users.sourceforge.net>2001-11-30 19:31:55 +0000
committerJames Courtier-Dutton <jcdutton@users.sourceforge.net>2001-11-30 19:31:55 +0000
commit2c170f65f62f5aa9dd853fc92cb7661e4f1d7176 (patch)
tree066a65072714648428591e679c0ff4bb5585692a /src/xine-engine
parentb6797395ab7e36b8365ba12c945266e0359972ee (diff)
downloadxine-lib-2c170f65f62f5aa9dd853fc92cb7661e4f1d7176.tar.gz
xine-lib-2c170f65f62f5aa9dd853fc92cb7661e4f1d7176.tar.bz2
More updates for menus.
CVS patchset: 1145 CVS date: 2001/11/30 19:31:55
Diffstat (limited to 'src/xine-engine')
-rw-r--r--src/xine-engine/buffer.h3
-rw-r--r--src/xine-engine/video_overlay.c8
2 files changed, 9 insertions, 2 deletions
diff --git a/src/xine-engine/buffer.h b/src/xine-engine/buffer.h
index 6e4a6de08..22288ecbd 100644
--- a/src/xine-engine/buffer.h
+++ b/src/xine-engine/buffer.h
@@ -17,7 +17,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*
- * $Id: buffer.h,v 1.24 2001/11/10 13:48:03 guenter Exp $
+ * $Id: buffer.h,v 1.25 2001/11/30 19:31:55 jcdutton Exp $
*
*
* contents:
@@ -122,6 +122,7 @@ extern "C" {
#define BUF_SPU_CLUT 0x04000000
#define BUF_SPU_PACKAGE 0x04010000
#define BUF_SPU_SUBP_CONTROL 0x04020000
+#define BUF_SPU_NAV 0x04030000
/* demuxer block types: */
diff --git a/src/xine-engine/video_overlay.c b/src/xine-engine/video_overlay.c
index d62e3a58b..8bcec55bd 100644
--- a/src/xine-engine/video_overlay.c
+++ b/src/xine-engine/video_overlay.c
@@ -17,7 +17,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*
- * $Id: video_overlay.c,v 1.4 2001/11/30 17:35:32 jcdutton Exp $
+ * $Id: video_overlay.c,v 1.5 2001/11/30 19:31:55 jcdutton Exp $
*
*/
@@ -336,6 +336,9 @@ static void video_overlay_event( video_overlay_t *this, int vpts ) {
printf ("video_overlay: SHOW SPU NOW\n");
#endif
if (this->video_overlay_events[this_event].event->object.overlay != NULL) {
+#ifdef LOG_DEBUG
+ video_overlay_print_overlay( this->video_overlay_events[this_event].event->object.overlay ) ;
+#endif
internal_video_overlay_free_handle( this, handle );
this->video_overlay_objects[handle].handle = handle;
@@ -381,6 +384,9 @@ static void video_overlay_event( video_overlay_t *this, int vpts ) {
if (this->video_overlay_events[this_event].event->object.overlay != NULL) {
vo_overlay_t *event_overlay = this->video_overlay_events[this_event].event->object.overlay;
vo_overlay_t *overlay;
+#ifdef LOG_DEBUG
+ video_overlay_print_overlay( this->video_overlay_events[this_event].event->object.overlay ) ;
+#endif
/* we need to allocate overlay on first EVENT_MENU_SPU */
if( !this->video_overlay_objects[handle].overlay ) {