Add default mkvreader object to mkvparser namespace. Add mkvreader

object to linux and mac libmkvparser.a.

Change-Id: Ibb94e8dee9a3a897bcda925916c5713cb45d35fe
This commit is contained in:
Frank Galligan 2011-05-06 14:45:09 -04:00
parent 5942099a85
commit 18ac83d501
3 changed files with 12 additions and 2 deletions

View File

@ -4,7 +4,7 @@ EXE = sample
CFLAGS = -W -Wall -g CFLAGS = -W -Wall -g
$(EXE): $(OBJECTS) $(EXE): $(OBJECTS)
$(AR) rcs $(LIB) mkvparser.o $(AR) rcs $(LIB) mkvparser.o mkvreader.o
$(CXX) $(OBJECTS) -L./ -lmkvparser -o $(EXE) $(CXX) $(OBJECTS) -L./ -lmkvparser -o $(EXE)
mkvparser.o: mkvparser.cpp mkvparser.o: mkvparser.cpp

View File

@ -10,6 +10,9 @@
#include <cassert> #include <cassert>
namespace mkvparser
{
MkvReader::MkvReader() : MkvReader::MkvReader() :
m_file(NULL) m_file(NULL)
{ {
@ -121,3 +124,5 @@ int MkvReader::Read(long long offset, long len, unsigned char* buffer)
return 0; //success return 0; //success
} }
} //end namespace mkvparser

View File

@ -12,7 +12,10 @@
#include "mkvparser.hpp" #include "mkvparser.hpp"
#include <cstdio> #include <cstdio>
class MkvReader : public mkvparser::IMkvReader namespace mkvparser
{
class MkvReader : public IMkvReader
{ {
MkvReader(const MkvReader&); MkvReader(const MkvReader&);
MkvReader& operator=(const MkvReader&); MkvReader& operator=(const MkvReader&);
@ -31,4 +34,6 @@ private:
FILE* m_file; FILE* m_file;
}; };
} //end namespace mkvparser
#endif //MKVREADER_HPP #endif //MKVREADER_HPP