[libcvd-members] libcvd/cvd videosource.h

[Edward Rosten]

CVSROOT:        /cvsroot/libcvd
Module name:    libcvd
Changes by:     Edward Rosten <edrosten>        11/04/05 12:52:15

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.29&r2=1.30

Patches:
Index: videosource.h
===================================================================
RCS file: /cvsroot/libcvd/libcvd/cvd/videosource.h,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -b -r1.29 -r1.30
--- videosource.h       20 Mar 2010 17:21:10 -0000      1.29
+++ videosource.h       5 Apr 2011 12:52:15 -0000       1.30
@@ -148,6 +148,8 @@
        // DiskBuffer2 buffer
        //
 
+       // This has to be done with conditional compilation.
+
 #ifdef CVD_HAVE_GLOB
        template<class T, bool Implemented = Pixel::DefaultConvertible<T>::is> 
struct makeDiskBuffer2
        {
@@ -165,6 +167,14 @@
                }
        };
 
+#else
+       template<class T, bool Implemented = 0> struct makeDiskBuffer2
+       {
+               static VideoBuffer<T>* make(const std::vector<std::string>& , 
double , VideoBufferFlags::OnEndOfBuffer)
+               {
+                       throw VideoSourceException("DiskBuffer2 (shell glob 
expansion) is not compiled in to libcvd.");
+               }
+       };
 #endif
 
        void get_files_options(const VideoSource& vs, int& fps, int& ra_frames, 
VideoBufferFlags::OnEndOfBuffer& eob);