diff options
Diffstat (limited to 'akode_artsplugin')
| -rw-r--r-- | akode_artsplugin/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | akode_artsplugin/Makefile.am | 6 | ||||
| -rw-r--r-- | akode_artsplugin/arts_inputstream.h | 14 |
3 files changed, 12 insertions, 12 deletions
diff --git a/akode_artsplugin/CMakeLists.txt b/akode_artsplugin/CMakeLists.txt index 6ff72d4d..726c074f 100644 --- a/akode_artsplugin/CMakeLists.txt +++ b/akode_artsplugin/CMakeLists.txt @@ -31,7 +31,7 @@ link_directories( tde_add_library( arts_akode SHARED AUTOMOC SOURCES - akodearts.cc akodePlayObject_impl.cpp + akodearts.cpp akodePlayObject_impl.cpp akodeMPCPlayObject_impl.cpp akodeMPEGPlayObject_impl.cpp akodeFFMPEGPlayObject_impl.cpp akodeXiphPlayObject_impl.cpp akodeVorbisStreamPlayObject_impl.cpp akodeSpeexStreamPlayObject_impl.cpp @@ -43,7 +43,7 @@ tde_add_library( arts_akode SHARED AUTOMOC add_custom_command( OUTPUT - akodearts.cc akodearts.h + akodearts.cpp akodearts.h akodearts.mcoptype akodearts.mcopclass COMMAND ${ARTS_MCOPIDL_EXECUTABLE} -t -I${ARTS_INCLUDEDIR} ${CMAKE_CURRENT_SOURCE_DIR}/akodearts.idl diff --git a/akode_artsplugin/Makefile.am b/akode_artsplugin/Makefile.am index 230a6a01..73d256f1 100644 --- a/akode_artsplugin/Makefile.am +++ b/akode_artsplugin/Makefile.am @@ -4,7 +4,7 @@ noinst_HEADERS = akodePlayObject_impl.h lib_LTLIBRARIES = libarts_akode.la -libarts_akode_la_SOURCES = akodearts.cc akodePlayObject_impl.cpp \ +libarts_akode_la_SOURCES = akodearts.cpp akodePlayObject_impl.cpp \ akodeMPCPlayObject_impl.cpp akodeMPEGPlayObject_impl.cpp \ akodeFFMPEGPlayObject_impl.cpp akodeXiphPlayObject_impl.cpp \ akodeVorbisStreamPlayObject_impl.cpp akodeSpeexStreamPlayObject_impl.cpp @@ -16,7 +16,7 @@ libarts_akode_la_COMPILE_FIRST = akodearts.h $(srcdir)/akodePlayObject_impl.cpp: akodearts.h akodearts.mcopclass: akodearts.h akodearts.mcoptype: akodearts.h -akodearts.cc akodearts.h: $(srcdir)/akodearts.idl +akodearts.cpp akodearts.h: $(srcdir)/akodearts.idl $(MCOPIDL) -t $(INCLUDES) $(srcdir)/akodearts.idl mcoptypedir = $(libdir)/mcop @@ -42,5 +42,5 @@ mcopclassdir = $(libdir)/mcop mcopclass_DATA = akodePlayObject.mcopclass \ $(AKODE_MPC) $(AKODE_MPEG) $(AKODE_XIPH) $(AKODE_FFMPEG) -CLEANFILES=akodearts.h akodearts.cc akodearts.mcopclass akodearts.mcoptype +CLEANFILES=akodearts.h akodearts.cpp akodearts.mcopclass akodearts.mcoptype diff --git a/akode_artsplugin/arts_inputstream.h b/akode_artsplugin/arts_inputstream.h index 1f68d177..c6f61e2c 100644 --- a/akode_artsplugin/arts_inputstream.h +++ b/akode_artsplugin/arts_inputstream.h @@ -75,8 +75,8 @@ public: long write(const char*, long) { return -1; } - bool seek(long to, int whence) { - if(!m_open || !seekable()) return false; + ssize_t lseek(long to, int whence) { + if(!m_open || !seekable()) return -1; arts_debug("akode: InputStream seeking"); @@ -89,21 +89,21 @@ public: newpos = m_pos + to; break; case SEEK_END: - if (m_len < 0) return false; + if (m_len < 0) return -1; newpos = m_len + to; break; default: - return false; + return -1; } - long s = m_instream.seek(newpos); + ssize_t s = m_instream.seek(newpos); if (s >= 0) { m_pos = s; m_buffer->flush(); - return true; + return s; } else - return false; + return -1; } long position() const { |