[Mplayer-cvslog] CVS: main/Gui/mplayer mw.h,1.27,1.28 play.c,1.37,1.38 psignal.c,1.15,1.16

[Zoltan Ponekker]

Update of /cvsroot/mplayer/main/Gui/mplayer
In directory mplayer:/var/tmp.root/cvs-serv10403/Gui/mplayer

Modified Files:
	mw.h play.c psignal.c 
Log Message:
add vcd,dvd,etcsymbol handling

Index: mw.h
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/mplayer/mw.h,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- mw.h	2 Oct 2001 15:01:36 -0000	1.27
+++ mw.h	24 Oct 2001 10:58:18 -0000	1.28
@@ -1,6 +1,8 @@
 
 // main window
 
+#include "../../libmpdemux/stream.h"
+
 unsigned char * mplDrawBuffer = NULL;
 int             mplMainRender = 1;
 int             mplMainAutoPlay = 0;
@@ -100,6 +102,16 @@
 	      case 2: strcat( trbuf,"t" ); break;
 	     }
 	    break;
+       case 'T': 
+    	   switch ( mplShMem->StreamType )
+	    {
+	     case STREAMTYPE_FILE:   strcat( trbuf,"f" ); break;
+	     case STREAMTYPE_VCD:    strcat( trbuf,"v" ); break;
+	     case STREAMTYPE_STREAM: strcat( trbuf,"u" ); break;
+	     case STREAMTYPE_DVD:    strcat( trbuf,"d" ); break;
+	     default:                strcat( trbuf," " ); break;
+	    }
+	   break;
        case '$': strcat( trbuf,"$" ); break;
        default: continue;
       }

Index: play.c
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/mplayer/play.c,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- play.c	16 Oct 2001 21:23:59 -0000	1.37
+++ play.c	24 Oct 2001 10:58:18 -0000	1.38
@@ -121,6 +121,7 @@
 
  mplShMem=calloc( 1,sizeof( mplCommStruct ) );
  mplShMem->Balance=50.0f;
+ mplShMem->StreamType=-1;
  memset(&sa, 0, sizeof(sa));
  sa.sa_handler = mplMainSigHandler;
  sigaction( SIGTYPE,&sa,NULL );
@@ -178,21 +179,6 @@
    wsResizeImage( &appMPlayer.menuWindow,appMPlayer.menuBase.width,appMPlayer.menuBase.height );
   }
 
-/*
- if ( appMPlayer.sub.Bitmap.Image ) wsResizeImage( &appMPlayer.subWindow,appMPlayer.sub.Bitmap.Width,appMPlayer.sub.Bitmap.Height );
- if ( !mplShMem->Playing )
-  {
-   if ( !appMPlayer.subWindow.isFullScreen ) 
-    {
-     wsResizeWindow( &appMPlayer.subWindow,appMPlayer.sub.width,appMPlayer.sub.height );
-     wsMoveWindow( &appMPlayer.subWindow,appMPlayer.sub.x,appMPlayer.sub.y );
-    } 
-   wsSetBackgroundRGB( &appMPlayer.subWindow,appMPlayer.subR,appMPlayer.subG,appMPlayer.subB );
-   wsClearWindow( appMPlayer.subWindow );
-   if ( appMPlayer.sub.Bitmap.Image ) wsConvert( &appMPlayer.subWindow,appMPlayer.sub.Bitmap.Image,appMPlayer.sub.Bitmap.ImageSize );
-   mplSubRender=1; wsPostRedisplay( &appMPlayer.subWindow );
-  }
-*/
  if ( appMPlayer.sub.Bitmap.Image ) wsResizeImage( &appMPlayer.subWindow,appMPlayer.sub.Bitmap.Width,appMPlayer.sub.Bitmap.Height );
  if ( ( !appMPlayer.subWindow.isFullScreen )&&( !mplShMem->Playing ) )
   {

Index: psignal.c
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/mplayer/psignal.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- psignal.c	20 Sep 2001 10:27:24 -0000	1.15
+++ psignal.c	24 Oct 2001 10:58:18 -0000	1.16
@@ -16,6 +16,7 @@
 
 #include "../../config.h"
 #include "../../libvo/x11_common.h"
+#include "../../libmpdemux/stream.h"
 
 #include "./mplayer.h"
 
@@ -174,6 +175,7 @@
 	strcat( mplShMem->Filename,gtkShMem->fs.filename );
 	printf( "%%%%%%%% Playing file: %s\n",mplShMem->Filename );
 	mplShMem->FilenameChanged=1;
+	mplShMem->StreamType=STREAMTYPE_FILE;
         if ( mplMainAutoPlay ) mplGeneralTimer=1;
         break;
    case evMessageBox: