[MPlayer-dev-eng] [PATCH] header file for stream/stream_vcd.c

[Reimar Döffinger]

On Fri, Mar 11, 2011 at 09:16:36AM +0100, Ingo Brückl wrote:
> Reimar Döffinger wrote on Fri, 11 Mar 2011 08:53:10 +0100:
> 
> > On 11 Mar 2011, at 00:04, Ingo Brückl <ib at wupperonline.de> wrote:
> >> Add missing header file for stream/stream_vcd.c.
> >>
> >> This fixes the compiler warning "no previous prototype for
> >> 'vcd_seek_to_track'" and supplies a declaration for code
> >> using this function.
> 
> > No, you should remove that function and instead use the send_command (or
> > what it is called) infrastructure.
> > The existence of such gui-only functions was the main reason we
> > considered removing the GUI.
> 
> Agreed, but could we please just add it temporarily for the moment being?

No, I don't think there's a sense to that.

> There is a lot rudimentary stuff to do with the GUI code and I can't spend
> time on rewriting, introducing and testing new stuff right now. First I have
> to have an overview on how the GUI works in detail and clean it up elementary
> before I can start seperating it.
> 
> I'll put this topic on my list and will remove all this as soon as possible.

Just use this as a band-aid (untested I admit):
Index: gui/interface.c
===================================================================
--- gui/interface.c     (revision 33029)
+++ gui/interface.c     (working copy)
@@ -67,8 +67,6 @@
 #include "stream/stream_dvd.h"
 #endif
 
-int vcd_seek_to_track(void *vcd, int track);
-
 #include "m_config.h"
 #include "m_option.h"
 
@@ -591,10 +589,8 @@
                    guiIntfStruct.VCDTracks=0;
                    break;
                }
-               for ( i=1;i < 100;i++ )
-                 if ( vcd_seek_to_track( stream->priv,i ) < 0 ) break;
-               vcd_seek_to_track( stream->priv,vcd_track );
-               guiIntfStruct.VCDTracks=--i;
+               stream_control(stream, STREAM_CTRL_GET_NUM_CHAPTERS, &guiIntfStruct.VCDTracks);
+               stream_control(stream, STREAM_CTRL_SEEK_TO_CHAPTER, &vcd_track);
                break;
               }
 #endif