[Mplayer-cvslog] CVS: main/libvo vo_aa.c,1.12,1.13

[Folke Ashberg]

Update of /cvsroot/mplayer/main/libvo
In directory mplayer:/var/tmp.root/cvs-serv31423/libvo

Modified Files:
	vo_aa.c 
Log Message:
aalib 1.4.X incombatibility fixed

Index: vo_aa.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_aa.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- vo_aa.c	17 Aug 2001 14:53:11 -0000	1.12
+++ vo_aa.c	17 Aug 2001 20:34:58 -0000	1.13
@@ -218,6 +218,7 @@
     struct stat sbuf;
     char * hidis = NULL;
     int i;
+    extern aa_linkedlist *aa_displayrecommended;
 
     switch(format) {
 	case IMGFMT_BGR24:
@@ -240,10 +241,7 @@
 
     /* initializing of aalib */
     
-    /* why removes get after getting it the gotten value out of the list? :( */
-    //hidis=aa_getfirst(&aa_displayrecommended); 
-    if (aa_displayrecommended!=NULL)
-      hidis=aa_displayrecommended->text;
+    hidis=aa_getfirst(&aa_displayrecommended); 
     if ( hidis==NULL ){
 	/* check /dev/vcsa<vt> */
 	/* check only, if no driver is explicit set */
@@ -261,7 +259,7 @@
     	    aa_recommendhidisplay("curses");
     	    aa_recommendhidisplay("X11");
 	}else fclose(fp);
-    }
+    } else aa_recommendhidisplay(hidis);
     c = aa_autoinit(&aa_defparams);
     aa_resizehandler(c, (void *)resize);