mirror of
https://gitlab.com/mbunkus/mkvtoolnix.git
synced 2024-12-24 11:54:01 +00:00
Removed more stuff that is not needed anymore.
This commit is contained in:
parent
23576c563e
commit
abb1db3bbf
@ -1,48 +0,0 @@
|
|||||||
RUNAR = $(AR) rcu
|
|
||||||
|
|
||||||
LINK = $(LD) $(LDFLAGS) $(LIBDIRS) $(SYSTEM_LIBDIRS)
|
|
||||||
LINKSHARED = $(CXX) $(LDFLAGS) $(LIBDIRS) $(SYSTEM_LIBDIRS) \
|
|
||||||
-shared -Wl,--export-all
|
|
||||||
|
|
||||||
CXXCOMPILE = $(CXX) $(CXXFLAGS) $(INCLUDES) $(SYSTEM_INCLUDES)
|
|
||||||
CCOMPILE = $(CC) $(CFLAGS) $(INCLUDES) $(SYSTEM_INCLUDES)
|
|
||||||
|
|
||||||
# Some general rules
|
|
||||||
.cpp.o:
|
|
||||||
$(CXXCOMPILE) -c -o $@ $<
|
|
||||||
|
|
||||||
.c.o:
|
|
||||||
$(CCOMPILE) -c -o $@ $<
|
|
||||||
|
|
||||||
subdirs:
|
|
||||||
list='$(SUBDIRS)'; \
|
|
||||||
for subdir in $$list; do \
|
|
||||||
echo "Making all in $$subdir"; \
|
|
||||||
(cd $$subdir && make -f Makefile.mingw) || exit 1; \
|
|
||||||
done
|
|
||||||
|
|
||||||
clean:
|
|
||||||
list='$(SUBDIRS)'; \
|
|
||||||
for subdir in $$list; do \
|
|
||||||
echo "Making clean in $$subdir"; \
|
|
||||||
(cd $$subdir && make -f Makefile.mingw clean) || exit 1; \
|
|
||||||
done
|
|
||||||
rm -f *.o lib*.a $(EXTRA_CLEAN)
|
|
||||||
|
|
||||||
depend:
|
|
||||||
list='$(SUBDIRS)'; \
|
|
||||||
for subdir in $$list; do \
|
|
||||||
echo "Making depend in $$subdir"; \
|
|
||||||
(cd $$subdir && make -f Makefile.mingw depend) || exit 1; \
|
|
||||||
done
|
|
||||||
ifneq (,$(ALL_SOURCES))
|
|
||||||
$(CXX) $(CXXFLAGS) $(INCLUDES) $(SYSTEM_INCLUDES) -MM \
|
|
||||||
$(ALL_SOURCES) > .depend
|
|
||||||
endif
|
|
||||||
|
|
||||||
#
|
|
||||||
# include dependency files if they exist
|
|
||||||
#
|
|
||||||
ifneq ($(wildcard .depend),)
|
|
||||||
include .depend
|
|
||||||
endif
|
|
@ -14,8 +14,6 @@ if gcc -v 2>&1 | grep -i mingw > /dev/null 2> /dev/null; then
|
|||||||
echo "Creating $n from $i"
|
echo "Creating $n from $i"
|
||||||
sed -e "s/Makefile.mingw/Makefile/g" < $i > $n
|
sed -e "s/Makefile.mingw/Makefile/g" < $i > $n
|
||||||
done
|
done
|
||||||
echo "Creating Makefile.common from Makefile.mingw.common"
|
|
||||||
sed -e "s!-f Makefile.mingw!!g" < Makefile.mingw.common > Makefile.common
|
|
||||||
|
|
||||||
if test "x$1" = "x"; then
|
if test "x$1" = "x"; then
|
||||||
if [ ! -f Makefile.options ]; then
|
if [ ! -f Makefile.options ]; then
|
||||||
|
@ -1,54 +0,0 @@
|
|||||||
/*
|
|
||||||
ogmmerge -- utility for splicing together ogg bitstreams
|
|
||||||
from component media subtypes
|
|
||||||
|
|
||||||
r_microdvd.h
|
|
||||||
class definitions for the MicroDVD text subtitle reader
|
|
||||||
|
|
||||||
Written by Moritz Bunkus <moritz@bunkus.org>
|
|
||||||
Based on Xiph.org's 'oggmerge' found in their CVS repository
|
|
||||||
See http://www.xiph.org
|
|
||||||
|
|
||||||
Distributed under the GPL
|
|
||||||
see the file COPYING for details
|
|
||||||
or visit http://www.gnu.org/copyleft/gpl.html
|
|
||||||
*/
|
|
||||||
|
|
||||||
#ifndef __R_MICRODVD_H
|
|
||||||
#define __R_MICRODVD_H
|
|
||||||
|
|
||||||
#include "os.h"
|
|
||||||
|
|
||||||
#include <stdio.h>
|
|
||||||
|
|
||||||
#include <ogg/ogg.h>
|
|
||||||
|
|
||||||
#include "ogmmerge.h"
|
|
||||||
|
|
||||||
#include "p_textsubs.h"
|
|
||||||
|
|
||||||
class microdvd_reader_c: public generic_reader_c {
|
|
||||||
private:
|
|
||||||
char chunk[2048];
|
|
||||||
mm_io_c *mm_io;
|
|
||||||
textsubs_packetizer_c *textsubspacketizer;
|
|
||||||
int act_wchar;
|
|
||||||
|
|
||||||
public:
|
|
||||||
microdvd_reader_c(char *fname, audio_sync_t *nasync) throw (error_c);
|
|
||||||
virtual ~microdvd_reader_c();
|
|
||||||
|
|
||||||
virtual int read();
|
|
||||||
virtual int serial_in_use(int);
|
|
||||||
virtual ogmmerge_page_t *get_page();
|
|
||||||
virtual ogmmerge_page_t *get_header_page(int header_type =
|
|
||||||
PACKET_TYPE_HEADER);
|
|
||||||
|
|
||||||
virtual int display_priority();
|
|
||||||
virtual void display_progress(bool final = false);
|
|
||||||
virtual void set_headers();
|
|
||||||
|
|
||||||
static int probe_file(mm_io_c *mm_io, int64_t size);
|
|
||||||
};
|
|
||||||
|
|
||||||
#endif // __R_MICRODVD_H
|
|
Loading…
Reference in New Issue
Block a user