[libcvd-members] libcvd/cvd videosource.h

[Edward Rosten]

CVSROOT:        /cvsroot/libcvd
Module name:    libcvd
Changes by:     Edward Rosten <edrosten>        11/04/06 17:50:36

Modified files:
        cvd            : videosource.h 

Log message:
        Fix open_video_source for missing glob.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/libcvd/cvd/videosource.h?cvsroot=libcvd&r1=1.30&r2=1.31

Patches:
Index: videosource.h
===================================================================
RCS file: /cvsroot/libcvd/libcvd/cvd/videosource.h,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -b -r1.30 -r1.31
--- videosource.h       5 Apr 2011 12:52:15 -0000       1.30
+++ videosource.h       6 Apr 2011 17:50:36 -0000       1.31
@@ -150,18 +150,19 @@
 
        // This has to be done with conditional compilation.
 
+
 #ifdef CVD_HAVE_GLOB
        template<class T, bool Implemented = Pixel::DefaultConvertible<T>::is> 
struct makeDiskBuffer2
        {
-               static VideoBuffer<T>* make(const std::vector<std::string>& 
files, double fps, VideoBufferFlags::OnEndOfBuffer eob)
+               static VideoBuffer<T>* make(const std::string& files, double 
fps, VideoBufferFlags::OnEndOfBuffer eob)
                {
-                       return new DiskBuffer2<T>(files, fps, eob);    
+                       return new DiskBuffer2<T>(globlist(files), fps, eob);   
 
                }
        };
 
        template<class T> struct makeDiskBuffer2<T, false>
        {
-               static VideoBuffer<T>* make(const std::vector<std::string>& , 
double , VideoBufferFlags::OnEndOfBuffer)
+               static VideoBuffer<T>* make(const std::string& , double , 
VideoBufferFlags::OnEndOfBuffer)
                {
                        throw VideoSourceException("DiskBuffer2 cannot handle 
type " + PNM::type_name<T>::name());
                }
@@ -170,7 +171,7 @@
 #else
        template<class T, bool Implemented = 0> struct makeDiskBuffer2
        {
-               static VideoBuffer<T>* make(const std::vector<std::string>& , 
double , VideoBufferFlags::OnEndOfBuffer)
+               static VideoBuffer<T>* make(const std::string& , double , 
VideoBufferFlags::OnEndOfBuffer)
                {
                        throw VideoSourceException("DiskBuffer2 (shell glob 
expansion) is not compiled in to libcvd.");
                }
@@ -306,7 +307,7 @@
                        int fps, ra_frames=0;
                        VideoBufferFlags::OnEndOfBuffer eob;
                        get_files_options(vs, fps, ra_frames, eob);
-                       VideoBuffer<T>* vb = 
makeDiskBuffer2<T>::make(globlist(vs.identifier), fps, eob);
+                       VideoBuffer<T>* vb = 
makeDiskBuffer2<T>::make(vs.identifier, fps, eob);
                        if (ra_frames)
                                vb = new ReadAheadVideoBuffer<T>(*vb, 
ra_frames);
                        return vb;