[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [k3b/kf5] /: Merge remote-tracking branch 'origin/master' into kf5
From: Johannes Obermayr <johannesobermayr () gmx ! de>
Date: 2014-10-18 11:21:09
Message-ID: E1XfS4L-0006yp-AT () scm ! kde ! org
[Download RAW message or body]
Git commit 9c9f5d662f700ed44d1439899fe4a18108b3ac7f by Johannes Obermayr.
Committed on 18/10/2014 at 11:13.
Pushed by jobermayr into branch 'kf5'.
Merge remote-tracking branch 'origin/master' into kf5
Conflicts:
CMakeLists.txt
libk3b/core/k3bexternalbinmanager.cpp
libk3b/projects/datacd/k3bisooptions.h
libk3b/tools/k3bcdparanoialib.cpp
src/k3burlnavigator.cpp
src/option/k3bdevicewidget.cpp
src/option/k3bexternalbinwidget.cpp
M +1 -17 CMakeLists.txt
M +2 -2 libk3b/core/k3bdefaultexternalprograms.cpp
M +24 -14 libk3b/core/k3bexternalbinmanager.cpp
M +3 -3 libk3b/core/k3bexternalbinmanager.h
M +1 -1 libk3b/core/k3bjob.cpp
M +4 -0 libk3b/jobs/k3bdatatrackreader.cpp
M +0 -1 libk3b/jobs/k3bdvdcopyjob.cpp
M +2 -2 libk3b/jobs/k3bvideodvdtitletranscodingjob.cpp
M +3 -2 libk3b/projects/datacd/k3bisooptions.cpp
M +19 -2 libk3b/projects/datacd/k3bisooptions.h
M +64 -27 libk3b/tools/k3bcdparanoialib.cpp
M +2 -1 libk3b/videodvd/k3bvideodvd.cpp
M +1 -1 libk3bdevice/k3bcrc.cpp
M +13 -0 libk3bdevice/k3bdevice.cpp
M +7 -0 libk3bdevice/k3bdevicemanager.cpp
M +1 -1 libk3bdevice/k3bscsicommand_netbsd.cpp
M +2 -0 plugins/decoder/musepack/k3bmpcwrapper.cpp
M +4 -4 plugins/decoder/wave/k3bwavedecoder.cpp
M +2 -2 plugins/encoder/lame/k3blametyes.h
M +4 -3 src/CMakeLists.txt
R +- -- src/icons/actions/16-actions-musicbrainz.png
M +9 -5 src/k3bmetaitemmodel.cpp
M +7 -7 src/k3bsystemproblemdialog.cpp
M +2 -2 src/k3burlnavigator.cpp
M +8 -9 src/option/k3bdevicewidget.cpp
M +1 -1 src/option/k3bdevicewidget.h
M +1 -1 src/option/k3bexternalbinpermissionmodel.cpp
M +1 -1 src/option/k3bexternalbinpermissionmodel.h
M +7 -7 src/option/k3bexternalbinwidget.cpp
M +2 -2 src/option/k3bexternalbinwidget.h
M +0 -1 src/projects/k3bfillstatusdisplay.cpp
M +42 -8 src/rip/k3bmassaudioencodingjob.cpp
M +4 -1 src/rip/videodvd/k3bvideodvdrippingpreview.cpp
http://commits.kde.org/k3b/9c9f5d662f700ed44d1439899fe4a18108b3ac7f
diff --cc CMakeLists.txt
index b25fdf2,8da4107..79d99b1
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -25,6 -24,10 +25,7 @@@ option(K3B_ENABLE_MUSICBRAINZ "Support
option(K3B_ENABLE_DVD_RIPPING "Support for ripping Video DVDs with optional \
decryption." ON) option(K3B_ENABLE_TAGLIB "Support for reading audio file metadata \
using Taglib." ON) option(K3B_BUILD_API_DOCS "Build the API documentation for the \
K3b libs." OFF) + option(K3B_ENABLE_PERMISSION_HELPER "Build the permissions helper \
program" OFF)
-if(NOT WIN32 AND NOT APPLE)
- option(K3B_ENABLE_HAL_SUPPORT "Support for inhibiting HAL from polling disk \
during write." OFF)
-endif(NOT WIN32 AND NOT APPLE)
# plugin options
option(K3B_BUILD_FFMPEG_DECODER_PLUGIN "Build FFmpeg decoder plugin" ON)
@@@ -163,126 -163,184 +164,109 @@@ if(K3B_BUILD_FFMPEG_DECODER_PLUGIN
endif(K3B_BUILD_FFMPEG_DECODER_PLUGIN)
if(K3B_BUILD_FLAC_DECODER_PLUGIN)
- find_package(Flac)
- find_package(Flac++)
- macro_log_feature( FLAC_FOUND "Flac"
- "Needed for the Flac audio decoder plugin."
- "http://flac.sourceforge.net/"
- FALSE "" "")
- macro_log_feature( FLAC++_FOUND "Flac++"
- "Needed for the Flac audio decoder plugin."
- "http://flac.sourceforge.net/"
- FALSE "" "")
-endif(K3B_BUILD_FLAC_DECODER_PLUGIN)
+ find_package(Flac)
+ set_package_properties(Flac PROPERTIES
+ PURPOSE "Needed for the Flac audio decoder plugin."
+ URL "http://flac.sourceforge.net"
+ TYPE OPTIONAL)
+
+ find_package(Flac++)
+ set_package_properties(Flac++ PROPERTIES
+ PURPOSE "Needed for the Flac audio decoder plugin."
+ URL "http://flac.sourceforge.net"
+ TYPE OPTIONAL)
+
+ if(FLAC_FOUND AND FLAC++_FOUND)
+ set(BUILD_FLAC_DECODER_PLUGIN 1)
+ endif()
+endif()
if(K3B_BUILD_MAD_DECODER_PLUGIN)
- find_package(Mad)
- macro_log_feature( MAD_FOUND "Mad mp3"
- "Needed for the mp3 audio decoder plugin."
- "http://www.underbit.com/products/mad/"
- FALSE "" "")
-endif(K3B_BUILD_MAD_DECODER_PLUGIN)
+ find_package(Mad)
+ set_package_properties(Mad PROPERTIES
+ PURPOSE "Needed for the mp3 audio decoder plugin."
+ URL "http://www.underbit.com/products/mad"
+ TYPE OPTIONAL)
+
+ set(BUILD_MAD_DECODER_PLUGIN "${MAD_FOUND}")
+endif()
if(K3B_BUILD_MUSE_DECODER_PLUGIN)
- find_package(Muse)
- macro_log_feature( MUSE_FOUND "Muse"
- "Needed for the Musepack audio decoder plugin"
- "http://www.musepack.net/"
- FALSE "" "")
-endif(K3B_BUILD_MUSE_DECODER_PLUGIN)
+ find_package(Muse)
+ set_package_properties(Muse PROPERTIES
+ PURPOSE "Needed for the Musepack audio decoder plugin"
+ URL "http://www.musepack.net"
+ TYPE OPTIONAL)
-if(K3B_BUILD_SNDFILE_DECODER_PLUGIN)
- find_package(Sndfile)
- macro_log_feature( SNDFILE_FOUND "Sndfile"
- "Needed for the libsndfile audio decoder plugin."
- "http://www.mega-nerd.com/libsndfile/"
- FALSE "" "")
-endif(K3B_BUILD_SNDFILE_DECODER_PLUGIN)
+ set(BUILD_MUSE_DECODER_PLUGIN "${MUSE_FOUND}")
+endif()
-if(K3B_BUILD_LAME_ENCODER_PLUGIN)
- find_package(Lame)
- macro_log_feature( LAME_FOUND "Lame mp3 encoder"
- "Needed for the lame mpf encoder encoder plugin."
- "http://lame.sourceforge.net/"
- FALSE "" "")
-endif(K3B_BUILD_LAME_ENCODER_PLUGIN)
+if(K3B_BUILD_SNDFILE_DECODER_PLUGIN)
+ find_package(Sndfile)
+ set_package_properties(Sndfile PROPERTIES
+ PURPOSE "Needed for the libsndfile audio decoder plugin."
+ URL "http://www.mega-nerd.com/libsndfile"
+ TYPE OPTIONAL)
-if(K3B_BUILD_OGGVORBIS_DECODER_PLUGIN OR K3B_BUILD_OGGVORBIS_ENCODER_PLUGIN)
- find_package(OggVorbis)
- macro_log_feature( OGGVORBIS_FOUND "Ogg Vorbis"
- "Needed for the K3b Ogg Vorbis decoder and encoder plugins."
- "http://www.vorbis.com/"
- FALSE "" "")
-endif(K3B_BUILD_OGGVORBIS_DECODER_PLUGIN OR K3B_BUILD_OGGVORBIS_ENCODER_PLUGIN)
+ set(BUILD_SNDFILE_DECODER_PLUGIN "${SNDFILE_FOUND}")
+endif()
+if(K3B_BUILD_LAME_ENCODER_PLUGIN)
+ find_package(Lame)
+ set_package_properties(Lame PROPERTIES
+ DESCRIPTION "Lame mp3 encoder"
+ PURPOSE "Needed for the lame mpf encoder encoder plugin."
+ URL "http://lame.sourceforge.net"
+ TYPE OPTIONAL)
-if (WIN32)
-find_library(SAMPLERATE_LIBRARIES samplerate-0)
-endif(WIN32)
+ set(BUILD_LAME_ENCODER_PLUGIN "${LAME_FOUND}")
+endif()
-################## K3b build settings #################################
+if(K3B_BUILD_OGGVORBIS_DECODER_PLUGIN OR K3B_BUILD_OGGVORBIS_ENCODER_PLUGIN)
+ find_package(OggVorbis)
+ set_package_properties(OggVorbis PROPERTIES
+ DESCRIPTION "Ogg Vorbis"
+ PURPOSE "Needed for the K3b Ogg Vorbis decoder and encoder plugins."
+ URL "http://www.vorbis.com"
+ TYPE OPTIONAL)
+
+ set(BUILD_OGGVORBIS_DECODER_PLUGIN "${OGGVORBIS_FOUND}")
+ set(BUILD_OGGVORBIS_ENCODER_PLUGIN "${OGGVORBIS_FOUND}")
+endif()
+
+################### K3b build settings #################################
include(ConfigureChecks)
-macro_bool_to_01(ADD_K3B_DEBUG K3B_DEBUG)
-
-if(K3B_ENABLE_DVD_RIPPING AND DVDREAD_FOUND)
- set(ENABLE_DVD_RIPPING 1)
-endif(K3B_ENABLE_DVD_RIPPING AND DVDREAD_FOUND)
-
-if(K3B_ENABLE_TAGLIB AND TAGLIB_FOUND)
- set(ENABLE_TAGLIB 1)
-endif(K3B_ENABLE_TAGLIB AND TAGLIB_FOUND)
-
-if(K3B_ENABLE_MUSICBRAINZ AND MUSICBRAINZ_FOUND)
- set(ENABLE_MUSICBRAINZ 1)
-endif(K3B_ENABLE_MUSICBRAINZ AND MUSICBRAINZ_FOUND)
-
-if(K3B_BUILD_FFMPEG_DECODER_PLUGIN AND FFMPEG_FOUND)
- set(BUILD_FFMPEG_DECODER_PLUGIN 1)
-endif(K3B_BUILD_FFMPEG_DECODER_PLUGIN AND FFMPEG_FOUND)
+set(BUILD_WAVE_DECODER_PLUGIN "${K3B_BUILD_WAVE_DECODER_PLUGIN}")
+set(BUILD_SOX_ENCODER_PLUGIN "${K3B_BUILD_SOX_ENCODER_PLUGIN}")
+set(BUILD_EXTERNAL_ENCODER_PLUGIN "${K3B_BUILD_EXTERNAL_ENCODER_PLUGIN}")
-if(K3B_BUILD_FLAC_DECODER_PLUGIN AND FLAC_FOUND AND FLAC++_FOUND)
- set(BUILD_FLAC_DECODER_PLUGIN 1)
-endif(K3B_BUILD_FLAC_DECODER_PLUGIN AND FLAC_FOUND AND FLAC++_FOUND)
+set(ENABLE_HAL_SUPPORT "${K3B_ENABLE_HAL_SUPPORT}")
+set(ENABLE_AUDIO_PLAYER "${QT_QTMULTIMEDIA_FOUND}")
-if(K3B_BUILD_MAD_DECODER_PLUGIN AND MAD_FOUND)
- set(BUILD_MAD_DECODER_PLUGIN 1)
-endif(K3B_BUILD_MAD_DECODER_PLUGIN AND MAD_FOUND)
+configure_file(config-k3b.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-k3b.h)
+include_directories(${CMAKE_BINARY_DIR})
-if(K3B_BUILD_MUSE_DECODER_PLUGIN AND MUSE_FOUND)
- set(BUILD_MUSE_DECODER_PLUGIN 1)
-endif(K3B_BUILD_MUSE_DECODER_PLUGIN AND MUSE_FOUND)
-
-if(K3B_BUILD_SNDFILE_DECODER_PLUGIN AND SNDFILE_FOUND)
- set(BUILD_SNDFILE_DECODER_PLUGIN 1)
-endif(K3B_BUILD_SNDFILE_DECODER_PLUGIN AND SNDFILE_FOUND)
-
-if(K3B_BUILD_LAME_ENCODER_PLUGIN AND LAME_FOUND)
- set(BUILD_LAME_ENCODER_PLUGIN 1)
-endif(K3B_BUILD_LAME_ENCODER_PLUGIN AND LAME_FOUND)
-
-if(K3B_BUILD_OGGVORBIS_DECODER_PLUGIN AND OGGVORBIS_FOUND)
- set(BUILD_OGGVORBIS_DECODER_PLUGIN 1)
-endif(K3B_BUILD_OGGVORBIS_DECODER_PLUGIN AND OGGVORBIS_FOUND)
-
-if(K3B_BUILD_OGGVORBIS_ENCODER_PLUGIN AND OGGVORBIS_FOUND)
- set(BUILD_OGGVORBIS_ENCODER_PLUGIN 1)
-endif(K3B_BUILD_OGGVORBIS_ENCODER_PLUGIN AND OGGVORBIS_FOUND)
-
-if(K3B_BUILD_WAVE_DECODER_PLUGIN)
- set(BUILD_WAVE_DECODER_PLUGIN 1)
-endif(K3B_BUILD_WAVE_DECODER_PLUGIN)
-
-if(K3B_BUILD_SOX_ENCODER_PLUGIN)
- set(BUILD_SOX_ENCODER_PLUGIN 1)
-endif(K3B_BUILD_SOX_ENCODER_PLUGIN)
-
-if(K3B_BUILD_EXTERNAL_ENCODER_PLUGIN)
- set(BUILD_EXTERNAL_ENCODER_PLUGIN 1)
-endif(K3B_BUILD_EXTERNAL_ENCODER_PLUGIN)
-
-if(K3B_ENABLE_HAL_SUPPORT)
- set(ENABLE_HAL_SUPPORT 1)
-endif(K3B_ENABLE_HAL_SUPPORT)
-
-if(K3B_ENABLE_PERMISSION_HELPER)
- set(ENABLE_PERMISSION_HELPER 1)
- message(STATUS "The permission helper will NOT be build")
- add_definitions(-DENABLE_PERMISSION_HELPER)
-endif(K3B_ENABLE_PERMISSION_HELPER)
-
-if(QT_QTMULTIMEDIA_FOUND)
- set(ENABLE_AUDIO_PLAYER 1)
-endif(QT_QTMULTIMEDIA_FOUND)
+################## K3b apidox ################################
+if(K3B_BUILD_API_DOCS)
+ find_package(Doxygen)
-configure_file (config-k3b.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-k3b.h )
+ if(DOXYGEN_EXECUTABLE)
+ configure_file(${CMAKE_SOURCE_DIR}/Doxyfile.cmake \
${CMAKE_BINARY_DIR}/Doxyfile)
+ if(EXISTS ${QT_DOC_DIR}/html)
+ set(QTDOCS "${QT_DOC_DIR}/html")
+ else()
+ set(QTDOCS "http://doc.trolltech.com/4.5/")
+ endif()
-################## K3b apidox ################################
-if(K3B_BUILD_API_DOCS)
- find_package(Doxygen)
-
- if(DOXYGEN_EXECUTABLE)
- configure_file(${k3b_SOURCE_DIR}/Doxyfile.cmake ${k3b_BINARY_DIR}/Doxyfile)
-
- if(EXISTS ${QT_DOC_DIR}/html)
- set(QTDOCS "${QT_DOC_DIR}/html")
- else(EXISTS ${QT_DOC_DIR}/html)
- set(QTDOCS "http://doc.trolltech.com/4.5/")
- endif(EXISTS ${QT_DOC_DIR}/html)
-
- add_custom_target(
- apidox
- COMMAND ${DOXYGEN_EXECUTABLE} Doxyfile
- COMMAND docs/html/installdox -l qt4.tag@${QTDOCS} docs/html/*.html)
- endif(DOXYGEN_EXECUTABLE)
+ add_custom_target(apidox
+ COMMAND ${DOXYGEN_EXECUTABLE} Doxyfile
+ COMMAND docs/html/installdox -l qt4.tag@${QTDOCS} docs/html/*.html)
+ endif()
endif(K3B_BUILD_API_DOCS)
- # openSUSE main distribution classifies changing to cdrom group and the helper
- # as evil: https://bugzilla.novell.com/show_bug.cgi?id=896601#c4
- # So don't allow building the helper on http://build.opensuse.org at all.
- if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux" AND
- EXISTS /home/abuild/.rpmmacros)
- file(STRINGS /home/abuild/.rpmmacros RPMMACROS)
- if("${RPMMACROS}" MATCHES "^.*opensuse_bs 1.*$" AND
- NOT "${RPMMACROS}" MATCHES "^.*packman_bs 1.*$")
- set(openSUSE ON)
- endif()
- endif()
-
- if(openSUSE)
- message(STATUS "Build openSUSE distro specific because it is FORCED by you or you \
use openSUSE infrastructure")
- add_definitions(-DopenSUSE)
- endif()
-
################## K3b build environment ################################
-
-add_definitions(${QT_DEFINITIONS} ${KDE4_DEFINITIONS})
-add_definitions(-DQT_USE_FAST_CONCATENATION -DQT_USE_FAST_OPERATOR_PLUS)
-include_directories(
- ${k3b_BINARY_DIR}
- ${k3b_SOURCE_DIR}/libk3bdevice
- ${k3b_SOURCE_DIR}/libk3b/core
- ${k3b_SOURCE_DIR}/libk3b/plugin
- ${k3b_SOURCE_DIR}/libk3b/tools
- ${k3b_SOURCE_DIR}/libk3b/tools/qprocess
- ${k3b_SOURCE_DIR}/libk3b/tools/qprocess/private
- ${k3b_SOURCE_DIR}/libk3b/projects
- ${k3b_SOURCE_DIR}/libk3b/projects/audiocd
- ${k3b_SOURCE_DIR}/libk3b/projects/datacd
- ${k3b_SOURCE_DIR}/libk3b/projects/videocd
- ${k3b_SOURCE_DIR}/libk3b/projects/mixedcd
- ${k3b_SOURCE_DIR}/libk3b/jobs
- ${k3b_SOURCE_DIR}/libk3b/videodvd
- ${KDE4_INCLUDES}
- ${KDE4_INCLUDE_DIR}
-)
-
add_subdirectory( libk3bdevice )
add_subdirectory( libk3b )
add_subdirectory( src )
diff --cc libk3b/core/k3bexternalbinmanager.cpp
index d9c61e3,228d466..4df0e88
--- a/libk3b/core/k3bexternalbinmanager.cpp
+++ b/libk3b/core/k3bexternalbinmanager.cpp
@@@ -365,8 -368,16 +366,16 @@@ bool K3b::SimpleExternalProgram::scanVe
vp << bin.path() << "--version";
if( vp.execute( EXECUTE_TIMEOUT ) < 0 ) {
if( vp.error() == 0 ) {
- qDebug() << "Insufficient permissions for " << bin.path();
- bin.setPermissions( false );
- kDebug() << "Insufficient permissions for" << bin.path();
++ qDebug() << "Insufficient permissions for" << bin.path();
+ // try to get real group or set fictive group to make
+ // K3b::SystemProblemDialog::checkSystem work
+ struct stat st;
+ if( !::stat( QFile::encodeName(bin.path()), &st ) ) {
+ QString group( getgrgid( st.st_gid )->gr_name );
- kDebug() << "Should be member of \"" << group << "\"";
++ qDebug() << "Should be member of \"" << group << "\"";
+ bin.setNeedGroup( group.isEmpty() ? "N/A" : group );
+ } else
+ bin.setNeedGroup( "N/A" );
}
return false;
}
diff --cc libk3b/jobs/k3bdatatrackreader.cpp
index bf71eb8,a6a5b68..0cb099e
--- a/libk3b/jobs/k3bdatatrackreader.cpp
+++ b/libk3b/jobs/k3bdatatrackreader.cpp
@@@ -255,10 -256,14 +255,14 @@@ bool K3b::DataTrackReader::run(
//
d->device->setSpeed( 0xffff, 0xffff );
+ #ifdef __NETBSD__
+ s_bufferSizeSectors = 31;
+ #else
s_bufferSizeSectors = 128;
+ #endif
unsigned char* buffer = new unsigned \
char[d->usedSectorSize*s_bufferSizeSectors];
while( s_bufferSizeSectors > 0 && read( buffer, d->firstSector.lba(), \
s_bufferSizeSectors ) < 0 ) {
- kDebug() << "(K3b::DataTrackReader) determine max read sectors: "
+ qDebug() << "(K3b::DataTrackReader) determine max read sectors: "
<< s_bufferSizeSectors << " too high." << endl;
s_bufferSizeSectors /= 2;
}
diff --cc libk3b/projects/datacd/k3bisooptions.h
index 7cdaf0f,49b3289..3743389
--- a/libk3b/projects/datacd/k3bisooptions.h
+++ b/libk3b/projects/datacd/k3bisooptions.h
@@@ -15,9 -15,10 +15,10 @@@
#ifndef K3B_ISO_OPTIONS_H
#define K3B_ISO_OPTIONS_H
-#include <qstring.h>
#include "k3b_export.h"
-#include <kconfiggroup.h>
-#include <klocalizedstring.h>
+#include <KConfigCore/KConfigGroup>
++#include <KI18n/KLocalizedString>
+#include <QtCore/QString>
namespace K3b {
diff --cc libk3b/tools/k3bcdparanoialib.cpp
index 0327889,d28e401..0f5fed5
--- a/libk3b/tools/k3bcdparanoialib.cpp
+++ b/libk3b/tools/k3bcdparanoialib.cpp
@@@ -479,40 -480,77 +479,77 @@@ K3b::CdparanoiaLib* K3b::CdparanoiaLib:
{
// check if libcdda_interface is avalilable
if( !s_libInterface->isLoaded() ) {
- s_haveLibCdio = false;
+ s_haveLibCdio = true;
- s_libInterface->setFileNameAndVersion( "cdda_interface", 0 );
+ // Windows ignores version:
+ // http://qt-project.org/doc/qt-4.8/qlibrary.html#setFileNameAndVersion
+ s_libInterface->setFileNameAndVersion( "cdio_cdda", 2 );
s_libInterface->setLoadHints( QLibrary::ResolveAllSymbolsHint | \
QLibrary::ExportExternalSymbolsHint );
-
- bool load_ok = s_libInterface->load();
-
- if (!load_ok) {
- // try the new cdio lib
+ #ifndef Q_OS_WIN32
+ if( !s_libInterface->load() ) {
s_libInterface->setFileNameAndVersion( "cdio_cdda", 1 );
- s_haveLibCdio = true;
- load_ok = s_libInterface->load();
- }
-
- if( !load_ok ) {
- qDebug() << "(K3b::CdparanoiaLib) Error while loading \
libcdda_interface. ";
- return 0;
+ if( !s_libInterface->load() ) {
+ s_libInterface->setFileNameAndVersion( "cdio_cdda", 0 );
+ if( !s_libInterface->load() ) {
+ s_libInterface->setFileNameAndVersion( "cdio_cdda", "" );
+ if( !s_libInterface->load() ) {
+ s_haveLibCdio = false;
+ s_libInterface->setFileNameAndVersion( "cdda_interface", 1 \
); + if( !s_libInterface->load() ) {
+ s_libInterface->setFileNameAndVersion( \
"cdda_interface", 0 ); + #endif
+ if( !s_libInterface->load() ) {
+ s_libInterface->setFileNameAndVersion( \
"cdda_interface", "" ); + if( !s_libInterface->load() \
) {
- kDebug() << "(K3b::CdparanoiaLib) Error while \
loading libcdda_interface."; ++ qDebug() << \
"(K3b::CdparanoiaLib) Error while loading libcdda_interface."; + \
return 0; + }
+ }
+ #ifndef Q_OS_WIN32
+ }
+ }
+ }
+ }
}
+ #endif
- s_libParanoia->setFileNameAndVersion( "cdda_paranoia", 0 );
- s_libParanoia->setLoadHints( QLibrary::ResolveAllSymbolsHint | \
QLibrary::ExportExternalSymbolsHint );
-
- load_ok = s_libParanoia->load();
- if ( s_haveLibCdio && !load_ok ) {
- // try the new cdio lib
- s_libParanoia->setFileNameAndVersion( "cdio_paranoia", 1 );
- load_ok = s_libParanoia->load();
+ s_libParanoia->setLoadHints( QLibrary::ResolveAllSymbolsHint | \
QLibrary::ExportExternalSymbolsHint ); + if( s_haveLibCdio ) {
+ s_libParanoia->setFileNameAndVersion( "cdio_paranoia", 2 );
+ #ifndef Q_OS_WIN32
+ if( !s_libParanoia->load() ) {
+ s_libParanoia->setFileNameAndVersion( "cdio_paranoia", 1 );
+ if( !s_libParanoia->load() ) {
+ s_libParanoia->setFileNameAndVersion( "cdio_paranoia", 0 );
+ if( !s_libParanoia->load() ) {
+ s_libParanoia->setFileNameAndVersion( "cdio_paranoia", "" \
); + #endif
+ s_libParanoia->load();
+ #ifndef Q_OS_WIN32
+ }
+ }
+ }
+ #endif
}
- if( !load_ok ) {
- qDebug() << "(K3b::CdparanoiaLib) Error while loading libcdda_paranoia. \
";
- s_libInterface->unload();
- return 0;
+ if( !s_libParanoia->isLoaded() ) {
+ s_libParanoia->setFileNameAndVersion( "cdda_paranoia", 1 );
+ #ifndef Q_OS_WIN32
+ if( !s_libParanoia->load() ) {
+ s_libParanoia->setFileNameAndVersion( "cdda_paranoia", 0 );
+ if( !s_libParanoia->load() ) {
+ s_libParanoia->setFileNameAndVersion( "cdda_paranoia", "" );
+ #endif
+ if( !s_libParanoia->load() ) {
- kDebug() << "(K3b::CdparanoiaLib) Error while loading \
libcdda_paranoia."; ++ qDebug() << "(K3b::CdparanoiaLib) Error \
while loading libcdda_paranoia."; + s_libInterface->unload();
+ return 0;
+ }
+ #ifndef Q_OS_WIN32
+ }
+ }
+ #endif
}
}
@@@ -685,8 -723,8 +722,8 @@@ char* K3b::CdparanoiaLib::read( int* st
}
if( d->currentSector != d->data->sector() ) {
- kDebug() << "(K3b::CdparanoiaLib) need to seek before read. Looks as if we \
are reusing the paranoia instance."; + qDebug() << "(K3b::CdparanoiaLib) need \
to seek before read. Looks as if we are reusing the paranoia \
instance.";
- if( !d->data->paranoiaSeek( d->currentSector, SEEK_SET ) )
+ if( d->data->paranoiaSeek( d->currentSector, SEEK_SET ) == -1 )
return 0;
}
diff --cc libk3bdevice/k3bcrc.cpp
index ac021ee,bbdb5cf..7bb805b
--- a/libk3bdevice/k3bcrc.cpp
+++ b/libk3bdevice/k3bcrc.cpp
@@@ -14,10 -14,10 +14,10 @@@
#include "k3bcrc.h"
-#include <kdebug.h>
+#include <QtCore/QDebug>
namespace {
- static quint16 g_x25Table[1<<8] = {
+ static const quint16 g_x25Table[1<<8] = {
0x0000, 0x1021, 0x2042, 0x3063, 0x4084, 0x50a5, 0x60c6, 0x70e7,
0x8108, 0x9129, 0xa14a, 0xb16b, 0xc18c, 0xd1ad, 0xe1ce, 0xf1ef,
0x1231, 0x0210, 0x3273, 0x2252, 0x52b5, 0x4294, 0x72f7, 0x62d6,
diff --cc libk3bdevice/k3bdevice.cpp
index cd085d7,fd7f9da..e2dcb5a
--- a/libk3bdevice/k3bdevice.cpp
+++ b/libk3bdevice/k3bdevice.cpp
@@@ -28,13 -35,10 +28,16 @@@
#include <Solid/OpticalDrive>
#include <Solid/Block>
#include <Solid/StorageAccess>
+ #ifdef __NETBSD__
+ #include <Solid/GenericInterface>
+ #endif
+#include <qglobal.h>
+#include <QtCore/QDebug>
+#include <QtCore/QFile>
+#include <QtCore/QMutex>
+#include <QtCore/QStringList>
+
#include <sys/types.h>
#include <sys/ioctl.h>
diff --cc libk3bdevice/k3bdevicemanager.cpp
index 5c61a7b,36da556..aa0f7e9
--- a/libk3bdevice/k3bdevicemanager.cpp
+++ b/libk3bdevice/k3bdevicemanager.cpp
@@@ -29,15 -39,10 +29,18 @@@
#include <Solid/OpticalDrive>
#include <Solid/Block>
#include <Solid/Device>
+ #ifdef __NETBSD__
+ #include <Solid/GenericInterface>
+ #endif
+#include <QtCore/QDebug>
+#include <QtCore/QString>
+#include <QtCore/QStringList>
+#include <QtCore/QFile>
+#include <QtCore/QFileInfo>
+#include <QtCore/QRegExp>
+#include <QtCore/QTemporaryFile>
+
#include <iostream>
#include <limits.h>
#include <assert.h>
@@@ -354,10 -359,14 +357,14 @@@ bool K3b::Device::DeviceManager::saveCo
K3b::Device::Device* K3b::Device::DeviceManager::addDevice( const Solid::Device& \
solidDevice ) {
if( const Solid::Block* blockDevice = solidDevice.as<Solid::Block>() ) {
+ #ifndef __NETBSD__
if( !findDevice( blockDevice->device() ) )
+ #else
+ if( !findDevice( \
solidDevice.as<Solid::GenericInterface>()->propertyExists("block.netbsd.raw_device") \
? solidDevice.as<Solid::GenericInterface>()->property("block.netbsd.raw_device").toString() \
: blockDevice->device() ) ); + #endif
return addDevice( new K3b::Device::Device( solidDevice ) );
else
- kDebug() << "(K3b::Device::DeviceManager) dev " << \
blockDevice->device() << " already found"; + qDebug() << \
"(K3b::Device::DeviceManager) dev " << blockDevice->device() << " already found"; }
return 0;
}
diff --cc src/CMakeLists.txt
index 1aab04f,0eb6b29..f7eaec7
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@@ -1,7 -1,37 +1,8 @@@
-project(k3b_src)
-
-include_directories(
- ${CMAKE_CURRENT_BINARY_DIR}
- ${CMAKE_CURRENT_SOURCE_DIR}
- ${libk3b_BINARY_DIR}
- ${libk3b_SOURCE_DIR}/core
- ${libk3b_SOURCE_DIR}/plugin
- ${libk3b_SOURCE_DIR}/tools
- ${libk3b_SOURCE_DIR}/projects
- ${libk3b_SOURCE_DIR}/projects/audiocd
- ${libk3b_SOURCE_DIR}/projects/datacd
- ${libk3b_SOURCE_DIR}/projects/videocd
- ${libk3b_SOURCE_DIR}/projects/mixedcd
- ${libk3b_SOURCE_DIR}/projects/movixcd/
- ${libk3b_SOURCE_DIR}/projects/videodvd/
- ${libk3b_SOURCE_DIR}/jobs
- ${libk3b_SOURCE_DIR}/videodvd
- ${libk3b_BINARY_DIR}/core
- ${libk3b_BINARY_DIR}/plugin
- ${libk3b_BINARY_DIR}/tools
- ${libk3b_BINARY_DIR}/projects
- ${libk3b_BINARY_DIR}/jobs
- ${CMAKE_CURRENT_SOURCE_DIR}/helper
- ${CMAKE_CURRENT_SOURCE_DIR}/projects
- ${CMAKE_CURRENT_SOURCE_DIR}/projects/kostore/
- ${libk3b_SOURCE_DIR}/cddb
- ${KCDDB_INCLUDE_DIR}
- )
- if(NOT openSUSE)
- add_subdirectory( helper )
- endif()
+ if(ENABLE_PERMISSION_HELPER)
+ add_subdirectory( helper )
+ endif(ENABLE_PERMISSION_HELPER)
+
add_subdirectory( icons )
add_subdirectory( pics )
add_subdirectory( services )
diff --cc src/icons/actions/16-actions-musicbrainz.png
index dbac22b,f2bb4ea..f2bb4ea
Binary files differ
diff --cc src/k3burlnavigator.cpp
index 4fad5de,03a30d2..2bb06c2
--- a/src/k3burlnavigator.cpp
+++ b/src/k3burlnavigator.cpp
@@@ -43,7 -44,7 +43,7 @@@ void K3b::UrlNavigator::setDevice( K3b:
{
QString mntPath = mountPoint->mountPoint();
if( !mntPath.isEmpty() ) {
- setUrl( QUrl::fromLocalFile( mntPath ) );
- setLocationUrl( KUrl( mntPath ) );
++ setLocationUrl( QUrl::fromLocalFile( mntPath ) );
return;
}
}
@@@ -51,7 -52,7 +51,7 @@@
const Medium& medium = k3bcore->mediaCache()->medium( dev );
if( medium.content() & Medium::ContentAudio )
{
- setUrl( QUrl( "audiocd://" ) );
- setLocationUrl( KUrl( "audiocd:/" ) );
++ setLocationUrl( QUrl( "audiocd:/" ) );
}
}
diff --cc src/option/k3bdevicewidget.cpp
index e57253c,b4f62da..90079ed
--- a/src/option/k3bdevicewidget.cpp
+++ b/src/option/k3bdevicewidget.cpp
@@@ -57,8 -58,8 +57,8 @@@ K3b::DeviceWidget::DeviceWidget( K3b::D
m_messageWidget = new KMessageWidget( this );
m_messageWidget->hide();
m_messageWidget->setWordWrap( true );
- #ifndef openSUSE
- m_addToGroupAction = new QAction( QIcon::fromTheme("dialog-password"), \
QString(), this ); + #ifdef ENABLE_PERMISSION_HELPER
- m_addToGroupAction = new KAction( KIcon("dialog-password"), QString(), this );
++ m_addToGroupAction = new KAction( QIcon::fromTheme("dialog-password"), \
QString(), this ); #endif
// buttons
diff --cc src/option/k3bexternalbinwidget.cpp
index 9a89e7d,f34b72b..e4a3aa9
--- a/src/option/k3bexternalbinwidget.cpp
+++ b/src/option/k3bexternalbinwidget.cpp
@@@ -123,9 -126,9 +123,9 @@@ K3b::ExternalBinWidget::ExternalBinWidg
m_permissionView->setModel( m_permissionModel );
m_permissionView->setAllColumnsShowFocus( true );
m_permissionView->setRootIsDecorated( false );
- m_permissionView->header()->setResizeMode( \
ExternalBinPermissionModel::ProgramColumn, QHeaderView::ResizeToContents ); + \
m_permissionView->header()->setSectionResizeMode( \
ExternalBinPermissionModel::ProgramColumn, \
QHeaderView::ResizeToContents );
- #ifndef openSUSE
+ #ifdef ENABLE_PERMISSION_HELPER
- m_changePermissionsButton = new KPushButton( KIcon("dialog-password"), i18n( \
"Change Permissions..." ), this ); + m_changePermissionsButton = new QPushButton( \
QIcon::fromTheme("dialog-password"), i18n( "Change Permissions..." ), this ); #endif
QVBoxLayout* permissionsTabLayout = new QVBoxLayout( permissionsTab );
permissionsTabLayout->addWidget( permissionsLabel );
diff --cc src/option/k3bexternalbinwidget.h
index 3142082,fb9390c..f287d36
--- a/src/option/k3bexternalbinwidget.h
+++ b/src/option/k3bexternalbinwidget.h
@@@ -65,9 -65,9 +65,9 @@@ namespace K3b
QTreeView* m_programView;
QTreeView* m_parameterView;
QTreeView* m_permissionView;
- KEditListBox* m_searchPathBox;
+ KEditListWidget* m_searchPathBox;
- #ifndef openSUSE
+ #ifdef ENABLE_PERMISSION_HELPER
QPushButton* m_changePermissionsButton;
#endif
QPushButton* m_rescanButton;
diff --cc src/rip/videodvd/k3bvideodvdrippingpreview.cpp
index ae445d6,188a6c9..af20227
--- a/src/rip/videodvd/k3bvideodvdrippingpreview.cpp
+++ b/src/rip/videodvd/k3bvideodvdrippingpreview.cpp
@@@ -112,11 -117,14 +112,14 @@@ void K3b::VideoDVDRippingPreview::cance
}
- void K3b::VideoDVDRippingPreview::slotTranscodeFinished( int, QProcess::ExitStatus \
) + void K3b::VideoDVDRippingPreview::slotTranscodeFinished( int, \
QProcess::ExitStatus exitStatus) {
+ if( exitStatus != QProcess::NormalExit )
+ return;
+
// read the image
- QString filename = m_tempDir->name() + "000000.ppm";// + tempQDir->entryList( \
QDir::Files ).first();
- kDebug() << "(K3b::VideoDVDRippingPreview) reading from file " << filename;
+ QString filename = QDir( m_tempDir->path() ).filePath( "000000.ppm" );// + \
tempQDir->entryList( QDir::Files ).first(); + qDebug() << \
"(K3b::VideoDVDRippingPreview) reading from file " << filename; m_preview = QImage( \
filename ); bool success = !m_preview.isNull() && !m_canceled;
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic