cmake conversion

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
pull/13/head
Michele Calgaro 6 months ago
parent 300613eef3
commit 802b45c556
Signed by: MicheleC
GPG Key ID: 2A75B7CA8ADED5CF

@ -0,0 +1,88 @@
############################################
#
# (C) 2023 Michele Calgaro
# Michele (DOT) Calgaro (AT) yahoo.it
#
# Improvements and feedback are welcome
#
# This file is released under GPL >= 2
#
############################################
cmake_minimum_required( VERSION 3.5 )
#### general package setup
project( soundkonverter )
#### include essential cmake modules
include( FindPkgConfig )
include( CheckSymbolExists )
include( CheckIncludeFile )
include( CheckLibraryExists )
include( CheckCSourceCompiles )
include( CheckCXXSourceCompiles )
include( CheckTypeSize )
#### include our cmake modules
include( TDEMacros )
##### set version number
tde_set_project_version( )
##### setup install paths
include( TDESetupPaths )
tde_setup_paths( )
##### optional stuff
option( WITH_ALL_OPTIONS "Enable all optional support" OFF )
option( WITH_GCC_VISIBILITY "Enable fvisibility and fvisibility-inlines-hidden" ${WITH_ALL_OPTIONS} )
##### user requested modules
option( BUILD_ALL "Build all" ON )
option( BUILD_DOC "Build documentation" ${BUILD_ALL} )
option( BUILD_TRANSLATIONS "Build translations" ${BUILD_ALL} )
##### configure checks
include( ConfigureChecks.cmake )
##### global compiler settings
set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${TQT_CXX_FLAGS}" )
set( CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--no-undefined" )
set( CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -Wl,--no-undefined" )
##### directories
add_subdirectory( src )
##### other data ################################
tde_conditional_add_project_docs( BUILD_DOC )
tde_conditional_add_subdirectory( BUILD_TRANSLATIONS po )
##### write configure files
configure_file( config.h.cmake config.h @ONLY )

@ -0,0 +1,56 @@
###########################################
# #
# Improvements and feedback are welcome #
# #
# This file is released under GPL >= 3 #
# #
###########################################
# required stuff
find_package( TQt )
find_package( TDE )
tde_setup_architecture_flags( )
include(TestBigEndian)
test_big_endian(WORDS_BIGENDIAN)
tde_setup_largefiles( )
check_type_size( "int" SIZEOF_INT BUILTIN_TYPES_ONLY )
check_type_size( "long" SIZEOF_LONG BUILTIN_TYPES_ONLY )
##### check for gcc visibility support
if( WITH_GCC_VISIBILITY )
tde_setup_gcc_visibility( )
endif( WITH_GCC_VISIBILITY )
##### check for taglib
pkg_search_module( TAGLIB taglib )
if( TAGLIB_FOUND )
if( ${TAGLIB_VERSION} VERSION_LESS "1.4" )
tde_message_fatal( "taglib version must be at least 1.4" )
else( )
message( STATUS "Found TAGLIB: ${TAGLIB_INCLUDE_DIRS}" )
endif( )
else( )
tde_message_fatal( "taglib is required, but not found on your system" )
endif( )
##### check for cdda interface and paranoia
message( STATUS "Checking for CDParanonia" )
find_path( CDPARANOIA_INCLUDE_DIR cdda_interface.h PATH_SUFFIXES cdda )
find_library( CDPARANOIA_LIBRARY NAMES cdda_paranoia )
find_library( CDPARANOIA_IF_LIBRARY NAMES cdda_interface )
if( CDPARANOIA_LIBRARY AND CDPARANOIA_IF_LIBRARY )
set( CDPARANOIA_LIBRARIES ${CDPARANOIA_LIBRARY} ${CDPARANOIA_IF_LIBRARY} )
else( )
tde_message_fatal( "CDParanoia is required, but not found on your system" )
endif( )

@ -0,0 +1,12 @@
#define VERSION "@VERSION@"
// Defined if you have fvisibility and fvisibility-inlines-hidden support.
#cmakedefine __KDE_HAVE_GCC_VISIBILITY 1
/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
significant byte first (like Motorola and SPARC, unlike Intel). */
#cmakedefine WORDS_BIGENDIAN @WORDS_BIGENDIAN@
// Define if you have int and long types
#cmakedefine SIZEOF_INT @SIZEOF_INT@
#cmakedefine SIZEOF_LONG @SIZEOF_LONG@

@ -0,0 +1 @@
tde_add_project_translations()

@ -0,0 +1,69 @@
include_directories(
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_SOURCE_DIR}/metadata
${CMAKE_CURRENT_SOURCE_DIR}/pluginloader
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_BINARY_DIR}
${TQT_INCLUDE_DIRS}
${TDE_INCLUDE_DIR}
${CDPARANOIA_INCLUDE_DIR}
)
link_directories(
${TDE_LIB_DIR}
)
##### subfolders
add_subdirectory( amarokscript )
add_subdirectory( metadata )
add_subdirectory( pics )
add_subdirectory( pluginloader )
add_subdirectory( plugins )
##### soundkonverter (executable)
tde_add_executable( soundkonverter AUTOMOC
SOURCES
cddb.cpp cdmanager.cpp cdopener.cpp combobutton.cpp
configuration.cpp configbackendspage.cpp configdialog.cpp configenvironmentpage.cpp
configgeneralpage.cpp configpagebase.cpp configpluginspage.cpp conversionoptions.cpp
convert.cpp cuesheeteditor.cpp dcopinterface.skel dirdialog.cpp filelist.cpp
logger.cpp logviewer.cpp main.cpp options.cpp optionsdetailed.cpp
optionseditor.cpp optionsrequester.cpp optionssimple.cpp outputdirectory.cpp paranoia.cpp
progressindicator.cpp replaygain.cpp replaygainfilelist.cpp replaygainscanner.cpp
soundkonverter.cpp soundkonverterapp.cpp
LINK
metadata-static tagspeex-static tagtrueaudio-static tagwavpack-static tagasf-static
tagwav-static tagrealmedia-static tagm4a-static tagaac-static tagaudible-static
tagmonkeysaudio-static tagoptimfrog-static pluginloader-static
tdecore-shared tdefx-shared tdeui-shared tdeio-shared tdetexteditor-shared DCOP-shared
${TAGLIB_LIBRARIES} ${CDPARANOIA_LIBRARIES}
DESTINATION ${BIN_INSTALL_DIR}
)
##### app icon
tde_install_icons( ${PROJECT_NAME} )
tde_install_icons( ${PROJECT_NAME}_replaygain )
##### other files
tde_create_translated_desktop(
SOURCE audiocd_extract_with_soundkonverter.desktop
DESTINATION ${DATA_INSTALL_DIR}/konqueror/servicemenus
)
tde_create_translated_desktop(
SOURCE soundkonverter.desktop
DESTINATION ${XDG_APPS_INSTALL_DIR}
)
install(
FILES soundkonverterui.rc
DESTINATION ${DATA_INSTALL_DIR}/soundkonverter
)

@ -0,0 +1,9 @@
install(
FILES README
DESTINATION ${DATA_INSTALL_DIR}/soundkonverter/amarokscript
)
install(
PROGRAMS soundKonverter.rb
DESTINATION ${DATA_INSTALL_DIR}/soundkonverter/amarokscript
)

@ -125,7 +125,7 @@ TQString CDManager::newCDDevice( const TQString& device )
CDDevice* cdDevice = new CDDevice( device );
for( TQValueList<CDDevice*>::Iterator it = cdDevices.begin(); it != cdDevices.end(); ++it ) {
if( (*it)->device = cdDevice->device ) {
if( (*it)->device == cdDevice->device ) {
cdDevices.remove( *it );
delete (*it);
break;
@ -139,7 +139,7 @@ TQString CDManager::newCDDevice( const TQString& device )
TQValueList<TagData*> CDManager::getTrackList( const TQString& device )
{
for( TQValueList<CDDevice*>::Iterator it = cdDevices.begin(); it != cdDevices.end(); ++it ) {
if( (*it)->device = device ) return (*it)->tags;
if( (*it)->device == device ) return (*it)->tags;
}
TQValueList<TagData*> list;
@ -149,7 +149,7 @@ TQValueList<TagData*> CDManager::getTrackList( const TQString& device )
TagData* CDManager::getTags( const TQString& device, int track )
{
for( TQValueList<CDDevice*>::Iterator it = cdDevices.begin(); it != cdDevices.end(); ++it ) {
if( (*it)->device = device ) {
if( (*it)->device == device ) {
if( track > 0 ) {
TQValueList<TagData*>::Iterator tag = (*it)->tags.at( track - 1 );
return (*tag);
@ -166,7 +166,7 @@ TagData* CDManager::getTags( const TQString& device, int track )
int CDManager::getTrackCount( const TQString& device )
{
for( TQValueList<CDDevice*>::Iterator it = cdDevices.begin(); it != cdDevices.end(); ++it ) {
if( (*it)->device = device ) return (*it)->trackCount;
if( (*it)->device == device ) return (*it)->trackCount;
}
return 0;
@ -175,7 +175,7 @@ int CDManager::getTrackCount( const TQString& device )
int CDManager::getTimeCount( const TQString& device )
{
for( TQValueList<CDDevice*>::Iterator it = cdDevices.begin(); it != cdDevices.end(); ++it ) {
if( (*it)->device = device ) return (*it)->timeCount;
if( (*it)->device == device ) return (*it)->timeCount;
}
return 0;
@ -184,7 +184,8 @@ int CDManager::getTimeCount( const TQString& device )
void CDManager::setDiscTags( const TQString& device, TagData* tags )
{
for( TQValueList<CDDevice*>::Iterator it = cdDevices.begin(); it != cdDevices.end(); ++it ) {
if( (*it)->device = device ) (*it)->discTags = tags;
if( (*it)->device == device ) (*it)->discTags = tags;
}
}
#include "cdmanager.moc"

@ -777,5 +777,4 @@ void CDOpener::saveCuesheetClicked()
cueFile.close();
}
#include "cdopener.moc"

@ -112,3 +112,4 @@ TQFont ComboButton::font()
return m_button->font();
}
#include "combobutton.moc"

@ -250,17 +250,17 @@ void ConfigBackendsPage::rebuild()
title = options.format;
}
options.group = new TQGroupBox( title, box, options.format );
options.group = new TQGroupBox( title, box, options.format.utf8().data() );
options.group->setColumnLayout( 0, TQt::Vertical );
options.group->layout()->setSpacing( 6 );
options.group->layout()->setMargin( 6 );
options.group->show();
options.grid = new TQGridLayout( options.group->layout() );
options.lEncoder = new TQLabel( i18n("Encoder")+":", options.group, options.format );
options.lEncoder = new TQLabel( i18n("Encoder")+":", options.group, options.format.utf8().data() );
options.lEncoder->show();
options.grid->addWidget( options.lEncoder, 0, 0 );
options.cEncoder = new KComboBox( options.group, options.format );
options.cEncoder = new KComboBox( options.group, options.format.utf8().data() );
options.cEncoder->show();
connect( options.cEncoder, TQT_SIGNAL(activated(int)),
this, TQT_SLOT(cfgChanged())
@ -270,11 +270,11 @@ void ConfigBackendsPage::rebuild()
);
options.grid->addWidget( options.cEncoder, 0, 1 );
options.lStrength = new TQLabel( i18n("Strength")+":", options.group, options.format );
options.lStrength = new TQLabel( i18n("Strength")+":", options.group, options.format.utf8().data() );
options.lStrength->setAlignment( TQt::AlignRight | TQt::AlignVCenter );
options.lStrength->show();
options.grid->addWidget( options.lStrength, 0, 2 );
options.sStrength = new TQSlider( TQt::Horizontal, options.group, options.format );
options.sStrength = new TQSlider( TQt::Horizontal, options.group, options.format.utf8().data() );
options.sStrength->setTickmarks( TQSlider::Below );
options.sStrength->show();
TQToolTip::add( options.sStrength, i18n("Set the compression strength:\n\nLeft = fast conversion\nRight = good resultant file") );
@ -286,30 +286,30 @@ void ConfigBackendsPage::rebuild()
this, TQT_SLOT(strengthChanged())
);
options.lDecoder = new TQLabel( i18n("Decoder")+":", options.group, options.format );
options.lDecoder = new TQLabel( i18n("Decoder")+":", options.group, options.format.utf8().data() );
options.lDecoder->show();
options.grid->addWidget( options.lDecoder, 1, 0 );
options.cDecoder = new KComboBox( options.group, options.format );
options.cDecoder = new KComboBox( options.group, options.format.utf8().data() );
options.cDecoder->show();
options.grid->addWidget( options.cDecoder, 1, 1 );
connect( options.cDecoder, TQT_SIGNAL(activated(int)),
this, TQT_SLOT(cfgChanged())
);
options.lStrengthDisplay = new TQLabel( "", options.group, options.format );
options.lStrengthDisplay = new TQLabel( "", options.group, options.format.utf8().data() );
options.lStrengthDisplay->setAlignment( TQt::AlignRight | TQt::AlignVCenter );
options.lStrengthDisplay->setEnabled( false );
options.grid->addWidget( options.lStrengthDisplay, 1, 3 );
options.lReplayGain = new TQLabel( i18n("Replay Gain")+":", options.group, options.format );
options.lReplayGain = new TQLabel( i18n("Replay Gain")+":", options.group, options.format.utf8().data() );
options.lReplayGain->show();
options.grid->addWidget( options.lReplayGain, 2, 0 );
options.cReplayGain = new KComboBox( options.group, options.format );
options.cReplayGain = new KComboBox( options.group, options.format.utf8().data() );
options.cReplayGain->show();
options.grid->addWidget( options.cReplayGain, 2, 1 );
connect( options.cReplayGain, TQT_SIGNAL(activated(int)),
this, TQT_SLOT(cfgChanged())
);
options.cInternalReplayGain = new TQCheckBox( i18n("Use internal Replay Gain"), options.group, options.format );
options.cInternalReplayGain = new TQCheckBox( i18n("Use internal Replay Gain"), options.group, options.format.utf8().data() );
TQToolTip::add( options.cInternalReplayGain, i18n("Use the internal Replay Gain calculator of the encoder") );
options.grid->addWidget( options.cInternalReplayGain, 2, 3 );
connect( options.cInternalReplayGain, TQT_SIGNAL(toggled(bool)),
@ -489,5 +489,4 @@ void ConfigBackendsPage::strengthChanged()
}
}
#include "configbackendspage.moc"

@ -172,3 +172,5 @@ void ConfigDialog::defaultClickedSlot()
setConfigChanged( true );
}
}
#include "configdialog.moc"

@ -220,4 +220,4 @@ void ConfigEnvironmentPage::refill()
emit rebuildBackendsPage();
}
#include "configenvironmentpage.moc"

@ -320,4 +320,4 @@ void ConfigGeneralPage::profileChanged()
}
}
#include "configgeneralpage.moc"

@ -18,3 +18,5 @@ void ConfigPageBase::cfgChanged()
{
emit configChanged();
}
#include "configpagebase.moc"

@ -379,7 +379,7 @@ void ConfigPluginsPage::aboutPlugin()
for( TQValueList<ConvertPlugin*>::Iterator it = converters.begin(); it != converters.end(); ++it ) {
if( name == (*it)->info.name + " v. " + TQString::number((*it)->info.version) ) {
KMessageBox::information( this,
i18n((*it)->info.about) + "\n" +
i18n((*it)->info.about.utf8().data()) + "\n" +
i18n("Version") + ": " + TQString::number((*it)->info.version) + "\n" +
i18n("Author") + ": " + (*it)->info.author,
i18n("About") + ": " + (*it)->info.name );
@ -391,7 +391,7 @@ void ConfigPluginsPage::aboutPlugin()
for( TQValueList<ReplayGainPlugin*>::Iterator it = replaygains.begin(); it != replaygains.end(); ++it ) {
if( name == (*it)->info.name + " v. " + TQString::number((*it)->info.version) ) {
KMessageBox::information( this,
i18n((*it)->info.about) + "\n" +
i18n((*it)->info.about.utf8().data()) + "\n" +
i18n("Version") + ": " + TQString::number((*it)->info.version) + "\n" +
i18n("Author") + ": " + (*it)->info.author,
i18n("About") + ": " + (*it)->info.name );
@ -403,7 +403,7 @@ void ConfigPluginsPage::aboutPlugin()
for( TQValueList<RipperPlugin*>::Iterator it = rippers.begin(); it != rippers.end(); ++it ) {
if( name == (*it)->info.name + " v. " + TQString::number((*it)->info.version) ) {
KMessageBox::information( this,
i18n((*it)->info.about) + "\n" +
i18n((*it)->info.about.utf8().data()) + "\n" +
i18n("Version") + ": " + TQString::number((*it)->info.version) + "\n" +
i18n("Author") + ": " + (*it)->info.author,
i18n("About") + ": " + (*it)->info.name );
@ -618,7 +618,7 @@ void ConfigPluginsPage::aboutOnlinePluginFinished( TDEIO::Job* job )
if( file.open(IO_ReadOnly) ) {
TQTextStream stream( &file );
TQString data = stream.readLine();
KMessageBox::information( this, i18n(data), i18n("About") + ": " + name,
KMessageBox::information( this, i18n(data.utf8().data()), i18n("About") + ": " + name,
TQString(), KMessageBox::Notify | KMessageBox::AllowLink );
}
else {
@ -636,4 +636,4 @@ void ConfigPluginsPage::aboutOnlinePluginFinished( TDEIO::Job* job )
pAboutOnlinePlugin->setEnabled( true );
}
#include "configpluginspage.moc"

@ -1513,4 +1513,4 @@ TQStringList Config::replayGainFileTypes()
return types;
}
#include "configuration.moc"

@ -177,11 +177,13 @@ void Convert::rip( ConvertItem* item )
TQString src;
if( item->fileListItem->track != 0 ) {
// TODO does it work with cds with less than 10 tracks?
src.sprintf( "audiocd:/Wav/Track %02i.wav?device=" + item->fileListItem->device + "&fileNameTemplate=Track %%{number}", item->fileListItem->track );
src = TQString("audiocd:/Wav/Track %1.wav?device=%2&fileNameTemplate=Track %%{number}").
arg(TQString::number(item->fileListItem->track).rightJustify(2, '0')).
arg(item->fileListItem->device);
}
else {
// FIXME implement ripping of full cds
src = "audiocd:/Full CD/Full CD.wav?device=" + item->fileListItem->device + "&albumTemplate=Full CD";
src = TQString("audiocd:/Full CD/Full CD.wav?device=%1&albumTemplate=Full CD").arg(item->fileListItem->device);
item->tracks = 1;
}
KURL source( src );
@ -206,15 +208,15 @@ void Convert::rip( ConvertItem* item )
item->convertProcess->clearArguments();
param = TQString();
if( plugin->rip.param ) param.append( " " + plugin->rip.param );
if( plugin->rip.device ) param.append( " " + plugin->rip.device );
if( plugin->rip.overwrite ) param.append( " " + plugin->rip.overwrite );
if( !plugin->rip.param.isEmpty() ) param.append( " " + plugin->rip.param );
if( !plugin->rip.device.isEmpty() ) param.append( " " + plugin->rip.device );
if( !plugin->rip.overwrite.isEmpty() ) param.append( " " + plugin->rip.overwrite );
if( item->fileListItem->track != 0 ) {
if( plugin->rip.track ) param.append( " " + plugin->rip.track );
if( !plugin->rip.track.isEmpty() ) param.append( " " + plugin->rip.track );
}
else {
if( plugin->rip.full_disc.param ) param.append( " " + plugin->rip.full_disc.param );
if( !plugin->rip.full_disc.param.isEmpty() ) param.append( " " + plugin->rip.full_disc.param );
item->tracks = cdManager->getTrackCount( item->fileListItem->device );
item->track = 0;
}
@ -464,10 +466,10 @@ void Convert::encode( ConvertItem* item )
}
}
if( item->fileListItem->options.encodingOptions.replaygain.bEnabled && plugin->enc.replaygain.enabled && plugin->enc.replaygain.use && formatItem->internalReplayGain ) {
if( item->fileListItem->options.encodingOptions.replaygain.bEnabled && plugin->enc.replaygain.enabled && !plugin->enc.replaygain.use.isEmpty() && formatItem->internalReplayGain ) {
param.append( " " + plugin->enc.replaygain.use );
}
else if( plugin->enc.replaygain.enabled && plugin->enc.replaygain.avoid ) {
else if( plugin->enc.replaygain.enabled && !plugin->enc.replaygain.avoid.isEmpty() ) {
param.append( " " + plugin->enc.replaygain.avoid );
}
@ -955,23 +957,23 @@ void Convert::processOutput( TDEProcess* proc, char* data, int )
if( outputPattern.find("%p") != -1 ) {
outputPattern.replace( "%p", "%i" );
sscanf( data, outputPattern, &iPercent );
sscanf( data, outputPattern.local8Bit().data(), &iPercent );
}
else if( outputPattern.find("%t") != -1 ) {
outputPattern.replace( "%t", "%i" );
sscanf( data, outputPattern, &iTime );
sscanf( data, outputPattern.local8Bit().data(), &iTime );
iPercent = iTime * 100 / (*item)->fileListItem->time;
}
else if( outputPattern.find("%0") != -1 && outputPattern.find("%1") != -1 ) {
if( outputPattern.find("%0") < outputPattern.find("%1") ) {
outputPattern.replace( "%0", "%i" );
outputPattern.replace( "%1", "%i" );
sscanf( data, outputPattern, &iPos, &iNum );
sscanf( data, outputPattern.local8Bit().data(), &iPos, &iNum );
}
else {
outputPattern.replace( "%0", "%i" );
outputPattern.replace( "%1", "%i" );
sscanf( data, outputPattern, &iNum, &iPos );
sscanf( data, outputPattern.local8Bit().data(), &iNum, &iPos );
}
if( iPos != 0 && iNum != 0 ) iPercent = iPos * 100 / iNum;
}
@ -1000,23 +1002,23 @@ void Convert::processOutput( TDEProcess* proc, char* data, int )
if( outputPattern.find("%p") != -1 ) {
outputPattern.replace( "%p", "%i" );
sscanf( data, outputPattern, &iPercent );
sscanf( data, outputPattern.local8Bit().data(), &iPercent );
}
else if( outputPattern.find("%t") != -1 ) {
outputPattern.replace( "%t", "%i" );
sscanf( data, outputPattern, &iTime );
sscanf( data, outputPattern.local8Bit().data(), &iTime );
iPercent = iTime * 100 / (*item)->fileListItem->time;
}
else if( outputPattern.find("%0") != -1 && outputPattern.find("%1") != -1 ) {
if( outputPattern.find("%0") < outputPattern.find("%1") ) {
outputPattern.replace( "%0", "%i" );
outputPattern.replace( "%1", "%i" );
sscanf( data, outputPattern, &iPos, &iNum );
sscanf( data, outputPattern.local8Bit().data(), &iPos, &iNum );
}
else {
outputPattern.replace( "%0", "%i" );
outputPattern.replace( "%1", "%i" );
sscanf( data, outputPattern, &iNum, &iPos );
sscanf( data, outputPattern.local8Bit().data(), &iNum, &iPos );
}
if( iPos != 0 && iNum != 0 ) iPercent = iPos * 100 / iNum;
}
@ -1043,23 +1045,23 @@ void Convert::processOutput( TDEProcess* proc, char* data, int )
if( outputPattern.find("%p") != -1 || outputPattern.find("%a") != -1 ) {
outputPattern.replace( "%p", "%i" );
outputPattern.replace( "%a", "%i" );
sscanf( data, outputPattern, &iPercent );
sscanf( data, outputPattern.local8Bit().data(), &iPercent );
}
else if( outputPattern.find("%t") != -1 ) {
outputPattern.replace( "%t", "%i" );
sscanf( data, outputPattern, &iTime );
sscanf( data, outputPattern.local8Bit().data(), &iTime );
iPercent = iTime * 100 / (*item)->fileListItem->time;
}
else if( outputPattern.find("%0") != -1 && outputPattern.find("%1") != -1 ) {
if( outputPattern.find("%0") < outputPattern.find("%1") ) {
outputPattern.replace( "%0", "%i" );
outputPattern.replace( "%1", "%i" );
sscanf( data, outputPattern, &iPos, &iNum );
sscanf( data, outputPattern.local8Bit().data(), &iPos, &iNum );
}
else {
outputPattern.replace( "%0", "%i" );
outputPattern.replace( "%1", "%i" );
sscanf( data, outputPattern, &iNum, &iPos );
sscanf( data, outputPattern.local8Bit().data(), &iNum, &iPos );
}
if( iPos != 0 && iNum != 0 ) iPercent = iPos * 100 / iNum;
}
@ -1613,3 +1615,4 @@ void Convert::updateProgressIndicator()
// }
#include "convert.moc"

@ -140,7 +140,7 @@ void CuesheetEditor::generate()
if( index == -1 )
break;
time = text.left( index );
sscanf( time, "%i:%i", &min, &sec );
sscanf( time.local8Bit().data(), "%i:%i", &min, &sec );
timeList.append( min * 60 + sec );
text.remove( 0, index + 2 );
}
@ -323,3 +323,5 @@ void CuesheetEditor::shift() //replace title by performer and reverse
tTextEdit->setText(newText);
}
*/
#include "cuesheeteditor.moc"

@ -152,3 +152,4 @@ void DirDialog::recursiveToggled( bool checked )
recursive = checked;
}
#include "dirdialog.moc"

@ -1413,10 +1413,10 @@ TQString FileList::debug_params( ConversionOptions conversionOptions, FormatItem
}
}
if( conversionOptions.encodingOptions.replaygain.bEnabled && plugin->enc.replaygain.enabled && plugin->enc.replaygain.use && formatItem->internalReplayGain ) {
if( conversionOptions.encodingOptions.replaygain.bEnabled && plugin->enc.replaygain.enabled && !plugin->enc.replaygain.use.isEmpty() && formatItem->internalReplayGain ) {
param.append( " " + plugin->enc.replaygain.use );
}
else if( plugin->enc.replaygain.enabled && plugin->enc.replaygain.avoid ) {
else if( plugin->enc.replaygain.enabled && !plugin->enc.replaygain.avoid.isEmpty() ) {
param.append( " " + plugin->enc.replaygain.avoid );
}
@ -1443,3 +1443,5 @@ TQString FileList::debug_params( ConversionOptions conversionOptions, FormatItem
return conversionOptions.encodingOptions.sInOutFiles.replace( "%p", param );
}
#include "filelist.moc"

@ -147,3 +147,4 @@ void Logger::processCompleted( int id, int state )
}
}
#include "logger.moc"

@ -201,4 +201,4 @@ void LogViewer::updateProcess( int id )
}
}
#include "logviewer.moc"

@ -0,0 +1,35 @@
include_directories(
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_BINARY_DIR}
${TQT_INCLUDE_DIRS}
${TDE_INCLUDE_DIR}
${TAGLIB_INCLUDE_DIRS}
)
link_directories(
${TQT_LIBRARY_DIRS}
${TDE_LIB_DIR}
)
##### subfolders
add_subdirectory( aac )
add_subdirectory( ape )
add_subdirectory( asf )
add_subdirectory( audible )
add_subdirectory( m4a )
add_subdirectory( optimfrog )
add_subdirectory( rmff )
add_subdirectory( speex )
add_subdirectory( trueaudio )
add_subdirectory( wav )
add_subdirectory( wavpack )
##### metadata
tde_add_library( metadata STATIC_PIC AUTOMOC
SOURCES tplugins.cpp tagengine.cpp
)

@ -0,0 +1,20 @@
include_directories(
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_BINARY_DIR}
${TQT_INCLUDE_DIRS}
${TDE_INCLUDE_DIR}
${TAGLIB_INCLUDE_DIRS}
)
link_directories(
${TQT_LIBRARY_DIRS}
${TDE_LIB_DIR}
)
##### pluginloader
tde_add_library( tagaac STATIC_PIC AUTOMOC
SOURCES aacfiletyperesolver.cpp
)

@ -0,0 +1,20 @@
include_directories(
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_BINARY_DIR}
${TQT_INCLUDE_DIRS}
${TDE_INCLUDE_DIR}
${TAGLIB_INCLUDE_DIRS}
)
link_directories(
${TQT_LIBRARY_DIRS}
${TDE_LIB_DIR}
)
##### pluginloader
tde_add_library( tagmonkeysaudio STATIC_PIC AUTOMOC
SOURCES taglib_monkeysaudiofiletyperesolver.cpp
)

@ -0,0 +1,20 @@
include_directories(
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_BINARY_DIR}
${TQT_INCLUDE_DIRS}
${TDE_INCLUDE_DIR}
${TAGLIB_INCLUDE_DIRS}
)
link_directories(
${TQT_LIBRARY_DIRS}
${TDE_LIB_DIR}
)
##### pluginloader
tde_add_library( tagasf STATIC_PIC AUTOMOC
SOURCES asfattribute.cpp asfproperties.cpp asftag.cpp asffile.cpp taglib_asffiletyperesolver.cpp
)

@ -0,0 +1,20 @@
include_directories(
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_BINARY_DIR}
${TQT_INCLUDE_DIRS}
${TDE_INCLUDE_DIR}
${TAGLIB_INCLUDE_DIRS}
)
link_directories(
${TQT_LIBRARY_DIRS}
${TDE_LIB_DIR}
)
##### pluginloader
tde_add_library( tagaudible STATIC_PIC AUTOMOC
SOURCES audibleproperties.cpp audibletag.cpp taglib_audiblefile.cpp taglib_audiblefiletyperesolver.cpp
)

@ -0,0 +1,27 @@
include_directories(
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_BINARY_DIR}
${TQT_INCLUDE_DIRS}
${TDE_INCLUDE_DIR}
${TAGLIB_INCLUDE_DIRS}
)
link_directories(
${TQT_LIBRARY_DIRS}
${TDE_LIB_DIR}
)
##### pluginloader
tde_add_library( tagm4a STATIC_PIC AUTOMOC
SOURCES
taglib_mp4filetyperesolver.cpp mp4file.cpp mp4itunestag.cpp mp4isobox.cpp mp4isofullbox.cpp
mp4skipbox.cpp mp4moovbox.cpp mp4mvhdbox.cpp mp4ilstbox.cpp boxfactory.cpp mp4fourcc.cpp
mp4udtabox.cpp mp4metabox.cpp mp4tagsproxy.cpp mp4mdiabox.cpp mp4minfbox.cpp mp4hdlrbox.cpp
mp4audioproperties.cpp mp4stblbox.cpp mp4audiosampleentry.cpp mp4stsdbox.cpp mp4sampleentry.cpp
mp4trakbox.cpp mp4propsproxy.cpp itunesnambox.cpp itunesartbox.cpp itunesalbbox.cpp
itunescvrbox.cpp itunesgenbox.cpp itunestrknbox.cpp itunesdaybox.cpp itunescmtbox.cpp
itunesgrpbox.cpp ituneswrtbox.cpp itunesdiskbox.cpp itunestmpobox.cpp itunesdatabox.cpp
)

@ -0,0 +1,20 @@
include_directories(
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_BINARY_DIR}
${TQT_INCLUDE_DIRS}
${TDE_INCLUDE_DIR}
${TAGLIB_INCLUDE_DIRS}
)
link_directories(
${TQT_LIBRARY_DIRS}
${TDE_LIB_DIR}
)
##### pluginloader
tde_add_library( tagoptimfrog STATIC_PIC AUTOMOC
SOURCES taglib_optimfrogfiletyperesolver.cpp
)

@ -0,0 +1,20 @@
include_directories(
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_BINARY_DIR}
${TQT_INCLUDE_DIRS}
${TDE_INCLUDE_DIR}
${TAGLIB_INCLUDE_DIRS}
)
link_directories(
${TQT_LIBRARY_DIRS}
${TDE_LIB_DIR}
)
##### pluginloader
tde_add_library( tagrealmedia STATIC_PIC AUTOMOC
SOURCES rmff.cpp taglib_realmediafile.cpp taglib_realmediafiletyperesolver.cpp
)

@ -0,0 +1,20 @@
include_directories(
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_BINARY_DIR}
${TQT_INCLUDE_DIRS}
${TDE_INCLUDE_DIR}
${TAGLIB_INCLUDE_DIRS}
)
link_directories(
${TQT_LIBRARY_DIRS}
${TDE_LIB_DIR}
)
##### pluginloader
tde_add_library( tagspeex STATIC_PIC AUTOMOC
SOURCES speexfile.cpp speexproperties.cpp taglib_speexfiletyperesolver.cpp
)

@ -0,0 +1,20 @@
include_directories(
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_BINARY_DIR}
${TQT_INCLUDE_DIRS}
${TDE_INCLUDE_DIR}
${TAGLIB_INCLUDE_DIRS}
)
link_directories(
${TQT_LIBRARY_DIRS}
${TDE_LIB_DIR}
)
##### pluginloader
tde_add_library( tagtrueaudio STATIC_PIC AUTOMOC
SOURCES ttafile.cpp ttaproperties.cpp taglib_trueaudiofiletyperesolver.cpp
)

@ -0,0 +1,20 @@
include_directories(
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_BINARY_DIR}
${TQT_INCLUDE_DIRS}
${TDE_INCLUDE_DIR}
${TAGLIB_INCLUDE_DIRS}
)
link_directories(
${TQT_LIBRARY_DIRS}
${TDE_LIB_DIR}
)
##### pluginloader
tde_add_library( tagwav STATIC_PIC AUTOMOC
SOURCES wavproperties.cpp wavfile.cpp wavfiletyperesolver.cpp
)

@ -0,0 +1,20 @@
include_directories(
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_BINARY_DIR}
${TQT_INCLUDE_DIRS}
${TDE_INCLUDE_DIR}
${TAGLIB_INCLUDE_DIRS}
)
link_directories(
${TQT_LIBRARY_DIRS}
${TDE_LIB_DIR}
)
##### pluginloader
tde_add_library( tagwavpack STATIC_PIC AUTOMOC
SOURCES wvfile.cpp wvproperties.cpp taglib_wavpackfiletyperesolver.cpp
)

@ -271,3 +271,4 @@ void Options::configChanged()
optionsSimple->refill();
}
#include "options.moc"

@ -595,7 +595,7 @@ void OptionsDetailed::qualityModeChanged()
cBitrateMode->insertStringList( sBitrateMode );
bitrateModeChanged();
if( plugin->enc.lossy.quality.help ) {
if( !plugin->enc.lossy.quality.help.isEmpty() ) {
TQString str = plugin->enc.lossy.quality.help;
str.replace("\\n","<br>");
TQWhatsThis::add( iQuality, "<p>"+str+"</p>" );
@ -909,3 +909,4 @@ void OptionsDetailed::toggleAdvancedOptions()
}
}
#include "optionsdetailed.moc"

@ -728,3 +728,4 @@ void OptionsEditor::editTagsClicked()
itemsSelected( selectedItems );
}
#include "optionseditor.moc"

@ -96,3 +96,4 @@ void OptionsRequester::setOutputDirectory( const TQString& directory )
}
#include "optionsrequester.moc"

@ -572,3 +572,4 @@ void OptionsSimple::refill()
outputDirectory->setDirectory( optionsDetailed->getOutputDirectoryPath() );
}
#include "optionssimple.moc"

@ -569,3 +569,4 @@ void OutputDirectory::directoryChangedSlot( const TQString& directory )
TQString(i18n("Legend")) );
}*/
#include "outputdirectory.moc"

@ -0,0 +1,6 @@
install(
FILES
ledgreen.png ledgreen_legend.png ledred.png ledred_legend.png ledyellow.png ledyellow_legend.png
DESTINATION
${DATA_INSTALL_DIR}/soundkonverter/pics
)

@ -0,0 +1,21 @@
include_directories(
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_BINARY_DIR}
${TQT_INCLUDE_DIRS}
${TDE_INCLUDE_DIR}
)
link_directories(
${TQT_LIBRARY_DIRS}
${TDE_LIB_DIR}
)
##### pluginloader
tde_add_library( pluginloader STATIC_PIC AUTOMOC
SOURCES
convertpluginloader.cpp formatinfoloader.cpp pluginloaderbase.cpp
replaygainpluginloader.cpp ripperpluginloader.cpp
)

@ -263,3 +263,4 @@ ConvertPlugin* ConvertPluginLoader::loadFile( TQString fileName )
return plugin;
}
#include "convertpluginloader.moc"

@ -86,3 +86,4 @@ FormatInfo* FormatInfoLoader::loadFile( TQString fileName )
return plugin;
}
#include "formatinfoloader.moc"

@ -15,3 +15,5 @@ void PluginLoaderBase::unload( TQString pluginName )
void PluginLoaderBase::remove( TQString pluginName )
{}
#include "pluginloaderbase.moc"

@ -114,3 +114,4 @@ ReplayGainPlugin* ReplayGainPluginLoader::loadFile( TQString fileName )
return plugin;
}
#include "replaygainpluginloader.moc"

@ -109,3 +109,4 @@ RipperPlugin* RipperPluginLoader::loadFile( TQString fileName )
return plugin;
}
#include "ripperpluginloader.moc"

@ -0,0 +1,3 @@
add_subdirectory( format_infos )
add_subdirectory( mime_types )
add_subdirectory( plugins )

@ -0,0 +1,9 @@
install(
FILES
3gp.xml aac.xml ac3.xml aiff.xml amr.xml ape.xml au.xml
avi.xml bonk.xml flac.xml la.xml m4a.xml mid.xml mod.xml mp2.xml mp3.xml
mpc.xml ofc.xml ofr.xml ofs.xml ogg.xml pac.xml qt.xml ra.xml shn.xml spx.xml
tta.xml wma.xml wv.xml wvc.xml
DESTINATION
${DATA_INSTALL_DIR}/soundkonverter/format_infos
)

@ -0,0 +1,18 @@
tde_create_translated_desktop(
SOURCE
amr.soundkonverter.desktop x-ape.soundkonverter.desktop x-bonk.soundkonverter.desktop x-pac.soundkonverter.desktop
x-tta.soundkonverter.desktop x-wavpack-correction.soundkonverter.desktop x-wavpack.soundkonverter.desktop
DESTINATION ${MIME_INSTALL_DIR}/audio
)
tde_create_translated_desktop(
SOURCE
x-la.soundkonverter.desktop x-ofc.soundkonverter.desktop x-ofr.soundkonverter.desktop
x-ofs.soundkonverter.desktop x-shorten.soundkonverter.desktop
DESTINATION ${MIME_INSTALL_DIR}/application
)
tde_create_translated_desktop(
SOURCE x-flv.soundkonverter.desktop
DESTINATION ${MIME_INSTALL_DIR}/video
)

@ -0,0 +1,17 @@
install(
FILES
110.oggvorbis.soundkonverter.xml 120.lame.soundkonverter.xml
122.twolame.soundkonverter.xml 123.toolame.soundkonverter.xml 125.gogo.soundkonverter.xml
127.faac.soundkonverter.xml 130.musepack.soundkonverter.xml 132.aften.soundkonverter.xml
135.flac.soundkonverter.xml 136.flake.soundkonverter.xml 137.mac.soundkonverter.xml
140.mplayer.soundkonverter.xml 145.ffmpeg.soundkonverter.xml 146.ffmpeg-lossless.soundkonverter.xml
150.shorten.soundkonverter.xml 151.tta.soundkonverter.xml 153.bonk.soundkonverter.xml
155.optimfrog.soundkonverter.xml 156.optimfrog-dualstream.soundkonverter.xml
158.wavpack.soundkonverter.xml 160.lac.soundkonverter.xml 165.lpac.soundkonverter.xml
170.speex.soundkonverter.xml 180.timidity.soundkonverter.xml 190.sox.soundkonverter.xml
210.vorbisgain.soundkonverter.xml 220.mp3gain.soundkonverter.xml 225.aacgain.soundkonverter.xml
230.replaygain.soundkonverter.xml 240.metaflac.soundkonverter.xml 250.wvgain.soundkonverter.xml
310.cdda2wav.soundkonverter.xml 320.cdparanoia.soundkonverter.xml
DESTINATION
${DATA_INSTALL_DIR}/soundkonverter/plugins
)

@ -142,3 +142,4 @@ void ProgressIndicator::update( float t )
TQToolTip::add( systemTray, percent );
}
#include "progressindicator.moc"

@ -33,18 +33,18 @@ bool ReplayGain::apply( TQStringList files, const TQString& format, TDEProcess*
}
param = TQString();
if( plugin->replaygain.param ) param.append( " " + plugin->replaygain.param );
if( !plugin->replaygain.param.isEmpty() ) param.append( " " + plugin->replaygain.param );
if( mode & remove ) {
if( plugin->replaygain.remove ) param.append( " " + plugin->replaygain.remove );
if( !plugin->replaygain.remove.isEmpty() ) param.append( " " + plugin->replaygain.remove );
}
else {
if( (mode & calc_track) && plugin->replaygain.track ) param.append( " " + plugin->replaygain.track );
if( (mode & calc_album) && plugin->replaygain.album ) param.append( " " + plugin->replaygain.album );
if( (mode & calc_track) && !plugin->replaygain.track.isEmpty() ) param.append( " " + plugin->replaygain.track );
if( (mode & calc_album) && !plugin->replaygain.album.isEmpty() ) param.append( " " + plugin->replaygain.album );
if( mode & force ) {
if( plugin->replaygain.force ) param.append( " " + plugin->replaygain.force );
if( !plugin->replaygain.force.isEmpty() ) param.append( " " + plugin->replaygain.force );
}
else {
if( plugin->replaygain.skip ) param.append( " " + plugin->replaygain.skip );
if( !plugin->replaygain.skip.isEmpty() ) param.append( " " + plugin->replaygain.skip );
}
}
@ -94,3 +94,5 @@ bool ReplayGain::apply( TQStringList files, const TQString& format, TDEProcess*
}
//TQValueList<float> ReplayGain::getReplayGain( TQString file ) {} // obsolete
#include "replaygain.moc"

@ -1156,7 +1156,7 @@ void ReplayGainFileList::processOutput( TDEProcess* proc, char* data, int )
if( outputPattern.find("%p") != -1 || outputPattern.find("%a") != -1 ) {
outputPattern.replace( "%p", "%i" );
//outputPattern.replace( "%a", "%i" ); // for compatibility with old plugins
sscanf( data, outputPattern, &iPercent );
sscanf( data, outputPattern.local8Bit().data(), &iPercent );
}
/*else if( outputPattern.find("%t") != -1 ) { // NOTE a little bit complicated and not necessary
outputPattern.replace( "%t", "%i" );
@ -1167,12 +1167,12 @@ void ReplayGainFileList::processOutput( TDEProcess* proc, char* data, int )
if( outputPattern.find("%0") < outputPattern.find("%1") ) {
outputPattern.replace( "%0", "%i" );
outputPattern.replace( "%1", "%i" );
sscanf( data, outputPattern, &iPos, &iNum );
sscanf( data, outputPattern.local8Bit().data(), &iPos, &iNum );
}
else {
outputPattern.replace( "%0", "%i" );
outputPattern.replace( "%1", "%i" );
sscanf( data, outputPattern, &iNum, &iPos );
sscanf( data, outputPattern.local8Bit().data(), &iNum, &iPos );
}
if( iPos != 0 && iNum != 0 ) iPercent = iPos * 100 / iNum;
}
@ -1260,3 +1260,4 @@ void ReplayGainFileList::update()
emit updateProgress( int(processedTime) + percent * int(timeCount) / 100, int(time) );
}
#include "replaygainfilelist.moc"

@ -148,7 +148,7 @@ void ReplayGainScanner::addClicked( int index )
void ReplayGainScanner::showFileDialog()
{
KFileDialog* dialog = new KFileDialog( ":file_open", config->replayGainFilter(), this, i18n("Choose files!"), true );
KFileDialog* dialog = new KFileDialog( ":file_open", config->replayGainFilter(), this, i18n("Choose files!").utf8().data(), true );
dialog->setMode ( KFile::Files | KFile::ExistingOnly );
if( dialog->exec() == KDialog::Accepted ) {
TQStringList urls = dialog->selectedURLs().toStringList();
@ -231,3 +231,4 @@ void ReplayGainScanner::updateProgress( int progress, int totalSteps )
setCaption( percent + " - " + i18n("Replay Gain Tool") );
}
#include "replaygainscanner.moc"

@ -131,3 +131,4 @@ int soundKonverterApp::newInstance()
return 0;
}
#include "soundkonverterapp.moc"

Loading…
Cancel
Save