mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-10 08:04:25 +02:00
Code Issues Releases Wiki Activity

First Implementation of SongType support in Playlists (needs libechonest from https://github.com/Horrendus/libechonest)

Browse Source
This commit is contained in:
Stefan Derkits
2012-12-01 14:43:04 +01:00
parent 86ce05f857
commit 2f591f89d2
2 changed files with 40 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp
View File

@@ -441,6 +441,28 @@ Tomahawk::EchonestControl::updateWidgets()
m_input = QWeakPointer< QWidget >( combo ); m_input = QWeakPointer< QWidget >( combo );
insertMoodsAndStyles(); insertMoodsAndStyles();
} else if( selectedType() == "Song Type" ) {
m_currentType = Echonest::DynamicPlaylist::SongType;
QComboBox* match = new QComboBox();
match->addItem( tr( "is" ), 1 );
match->addItem( tr( "is not" ), 0 );
QComboBox* combo = new QComboBox();
combo->addItem( tr( "Christmas" ), "christmas" );
combo->addItem( tr( "Studio" ), "studio" );
combo->addItem( tr( "Live" ), "live" );
connect( match, SIGNAL( activated( int ) ), this, SLOT( updateData() ) );
connect( match, SIGNAL( activated( int ) ), this, SLOT( editingFinished() ) );
connect( combo, SIGNAL( activated( int ) ), this, SLOT( updateData() ) );
connect( combo, SIGNAL( activated( int ) ), this, SLOT( editingFinished() ) );
m_matchString = match->currentText();
m_matchData = match->currentText();
m_match = QWeakPointer< QWidget >( match );
m_input = QWeakPointer< QWidget >( combo );
} else { } else {
m_match = QWeakPointer<QWidget>( new QWidget ); m_match = QWeakPointer<QWidget>( new QWidget );
m_input = QWeakPointer<QWidget>( new QWidget ); m_input = QWeakPointer<QWidget>( new QWidget );
@@ -522,6 +544,23 @@ Tomahawk::EchonestControl::updateData()
m_data.second = enumVal; m_data.second = enumVal;
// qDebug() << "SAVING" << input->currentIndex() << "AS" << enumVal << "(" << input->itemData( input->currentIndex() ).toInt() << "+" << m_matchData.toInt() << ")"; // qDebug() << "SAVING" << input->currentIndex() << "AS" << enumVal << "(" << input->itemData( input->currentIndex() ).toInt() << "+" << m_matchData.toInt() << ")";
} }
} else if( selectedType() == "Song Type" ) {
QComboBox* match = qobject_cast<QComboBox*>( m_match.data() );
QComboBox* input = qobject_cast< QComboBox* >( m_input.data() );
if ( match && input ) {
m_matchString = match->currentText();
m_matchData = match->itemData( match->currentIndex() ).toString();
QString songType = input->currentText().toLower();
if ( match->currentText() == "is not" )
songType.append(":false");
qDebug() << "ST: " << songType;
m_data.first = Echonest::DynamicPlaylist::SongType;
m_data.second = songType;
}
} }
calculateSummary(); calculateSummary();

2
src/libtomahawk/playlist/dynamic/echonest/EchonestGenerator.cpp
View File

@@ -65,7 +65,7 @@ EchonestFactory::typeSelectors() const
{ {
QStringList types = QStringList() << "Artist" << "Artist Description" << "User Radio" << "Song" << "Mood" << "Style" << "Adventurousness" << "Variety" << "Tempo" << "Duration" << "Loudness" QStringList types = QStringList() << "Artist" << "Artist Description" << "User Radio" << "Song" << "Mood" << "Style" << "Adventurousness" << "Variety" << "Tempo" << "Duration" << "Loudness"
<< "Danceability" << "Energy" << "Artist Familiarity" << "Artist Hotttnesss" << "Song Hotttnesss" << "Danceability" << "Energy" << "Artist Familiarity" << "Artist Hotttnesss" << "Song Hotttnesss"
<< "Longitude" << "Latitude" << "Mode" << "Key" << "Sorting"; << "Longitude" << "Latitude" << "Mode" << "Key" << "Sorting" << "Song Type";
return types; return types;
} }