";
+ Fat.fade_element('breadcrumb',null,2000,'#F5C2C2','#ffffff');
+ }
+
+ function searchMusic(form){
+ if(form.searchbox.value == '' || form.searchbox.value == '[]'){
+ setMsgText("You Must Enter Something to Search For");
+ }
+ else{
+ document.getElementById("breadcrumb").innerHTML = "";
+ x_searchMusic(form.searchbox.value,form.search_options.value,updateBox_cb);
+ }
+ return false;
+ }
+
Property changes on: mythweb/modules/music/mp3act_js.js.php
___________________________________________________________________
Name: svn:executable
+ *
Index: mythweb/modules/music/mp3act_functions.php
===================================================================
--- mythweb/modules/music/mp3act_functions.php (revision 0)
+++ mythweb/modules/music/mp3act_functions.php (revision 0)
@@ -0,0 +1,916 @@
+".$row["playlist_name"]."\";";
+ else
+ $output .= "\"".$row["playlist_name"]."@".$row["hostname"]." \";";
+ }
+ return $output;
+}
+
+function genreform(){
+ $query = "SELECT * FROM music_genres ORDER BY genre";
+ $result = mysql_query($query);
+
+ $output = "
+ ".t("Choose Genre..");
+
+ while($genre = mysql_fetch_array($result)){
+ $output .= " $genre[genre]\n";
+ }
+ $output .= " ";
+
+ return $output;
+}
+
+function letters(){
+ $output = "";
+ $letters = array('#','a','b','c','d','e','f','g','h','i','j','k','l','m','n','o','p','q','r','s','t','u','v','w','x','y','z');
+
+ foreach($letters as $letter){
+ $output .= "".strtoupper($letter)." ";
+ return $output;
+}
+
+function getDropDown($type, $id){
+ $dropdown = "";
+ return $dropdown;
+}
+
+function buildBreadcrumb($page,$parent,$parentitem,$child,$childitem){
+ $childoutput='';
+ $parentoutput ='';
+ if($page == 'browse' && $child != ''){
+ $output = "Browse » ";
+ }
+ switch($child){
+ case 'album':
+ $query = "SELECT music_albums.album_name,music_artists.artist_name,music_artists.artist_id FROM music_albums,music_artists WHERE music_albums.artist_id=music_artists.artist_id AND music_albums.album_id=$childitem";
+ $result = mysql_query($query);
+ $row = mysql_fetch_array($result);
+ $albums = '';
+ $query = "SELECT album_name,album_id FROM music_albums WHERE artist_id=$row[artist_id] ORDER BY album_name";
+ $result = mysql_query($query);
+ while($row2 = mysql_fetch_array($result)){
+ $albums .= "$row2[album_name] " . $row['artist_name'] . " $row2[album_name] $row[artist_name] ".strtoupper($childitem)." ".letters()."".strtoupper($parentitem)." ".letters()."$parentitem » ";
+ break;
+ case 'all':
+ $parentoutput .= "$parentitem » ";
+ break;
+
+ }
+ if (isset($output)) {
+ return $output.$parentoutput.$childoutput;
+ } else {
+ return '';
+ }
+}
+
+function musicLookup($type,$itemid){
+ switch($type){
+ case 'browse':
+ $output = "";
+ $output .= "
".t("Browse the Music Database")." ";
+ $output .= "";
+ $output .= "".t("By Artist Beginning With")."
\n";
+ $output .= "".t("By Genre")."
\n";
+
+ break;
+ case 'search':
+ $output = "";
+ $output .= "
".t("Search the Music Database")." ";
+ $output .= "";
+ $output .= "\n";
+
+ break;
+ case 'letter':
+ if($itemid == "#"){
+ $query = "SELECT * FROM music_artists
+ WHERE artist_name
+ LIKE '0%'
+ OR artist_name LIKE '1%'
+ OR artist_name LIKE '2%'
+ OR artist_name LIKE '3%'
+ OR artist_name LIKE '4%'
+ OR artist_name LIKE '5%'
+ OR artist_name LIKE '6%'
+ OR artist_name LIKE '7%'
+ OR artist_name LIKE '8%'
+ OR artist_name LIKE '9%'
+ ORDER BY artist_name";
+ }else{
+ $query = "SELECT * FROM music_artists
+ WHERE artist_name LIKE '$itemid%'
+ ORDER BY artist_name";
+ }
+ $result = mysql_query($query);
+ $output = "";
+ $output .= "
".t("Artists Beginning with")." '".strtoupper($itemid)."' ";
+ $output .= "
+ ".t("Artist Listing")."
+ ";
+ $count =1;
+ while($row = mysql_fetch_array($result)){
+ ($count%2 == 0 ? $alt = "class=\"alt\"" : $alt = '');
+ $output .= "$row[artist_name] \n";
+
+ break;
+
+ case 'all':
+ $output = "";
+ $output .= "
".t("All Albums")." ";
+ $output .= "
+ ".t("Album Listing")."
+ ";
+ $start = $itemid;
+ $query = "SELECT * FROM music_albums";
+
+ $result = mysql_query($query);
+ $count = 1;
+ while($row = mysql_fetch_array($result)){
+ ($count%2 == 0 ? $alt = "class=\"alt\"" : $alt = '');
+ $output .= "" . $row['album_name'] . " \n";
+ break;
+
+ case 'album':
+ $query = "SELECT count(music_songs.length),sum(music_songs.length) FROM music_songs GROUP BY music_songs.album_id HAVING music_songs.album_id = $itemid;";
+ $result = mysql_query($query);
+ $row = mysql_fetch_array($result);
+ $anzahl = $row[0];
+ $length = $row[1];
+
+ $query="SELECT music_songs.*, music_albums.album_name, music_artists.artist_name FROM (music_songs INNER JOIN music_albums ON music_songs.album_id = music_albums.album_id) INNER JOIN music_artists ON music_songs.artist_id = music_artists.artist_id WHERE music_albums.album_id = $itemid;";
+ $result = mysql_query($query);
+ $row = mysql_fetch_array($result);
+
+ $path = $_SERVER["DOCUMENT_ROOT"].root."data/music/".substr($row["filename"],0,strrpos($row["filename"],"/")) ;
+ $verzeichnis = @dir($path);
+ while($datei = @$verzeichnis->read()) {
+ $end = strtolower(substr($datei,-3));
+ if ($end == "jpg" || $end == "gif" || $end == "png")
+ {$album_art_arr[] = $datei;}
+ }
+ $verzeichnis->close();
+
+ srand(microtime()*1000000);
+ $zuf = rand(1,count($album_art_arr)-1);
+ $album_art = $album_art_arr[round($zuf)];
+
+ $album_art = root."data/music/".substr($row["filename"],0,strrpos($row["filename"],"/"))."/".$album_art;
+
+ $output = "";
+ $output .= "
";
+ $output .= "
".$row['album_name']." ".t("Play Time").": $length\n";
+ $output .= " ".t("Album Tracks")." \n";
+ $output .= "\n";
+ break;
+ case 'genre':
+
+ $output = "";
+ $output .= "
".t("Songs for Genre")." '$itemid' ";
+ $output .= "
+ ".t("Songs")."
+ \n";
+ break;
+ case 'artist':
+ $query = "SELECT artist_id,artist_name FROM music_artists WHERE artist_id=$itemid";
+ $result = mysql_query($query);
+ $row = mysql_fetch_array($result);
+
+
+ $artist = $row[artist_name];
+
+ $output = "";
+ $output .= "
$row[artist_name] ";
+ $output .= "\n";
+ $output .= "".t("Songs")."
\n";
+ $output .= "\n";
+ $output .= "".t("Album's with songs from")." $artist
\n";
+ $output .= "\n";
+
+ $query = "SELECT music_albums.album_name, music_albums.album_id FROM music_songs INNER JOIN music_albums ON music_songs.album_id = music_albums.album_id GROUP BY music_albums.album_name, music_albums.album_id, music_songs.artist_id HAVING (((music_songs.artist_id)=$itemid));";
+ $result = mysql_query($query);
+ $count=1;
+ while($row = mysql_fetch_array($result)){
+ ($count%2 == 0 ? $alt = "class=\"alt\"" : $alt = '');
+ $output .= "" . $row['album_name'] . " " . (($row['album_year'] != 0) ? ("(" . $row['album_year'] . ") ") : (""))." \n";
+ break;
+ case 'random':
+ $output = "";
+ $output .= "
".t("Random Mix Maker")." ";
+ $output .= "\n";
+ break;
+ case 'playlists':
+ $query = "SELECT *,SEC_TO_TIME(time) AS time2 FROM music_saved_playlists";
+ $result = mysql_query($query);
+
+ $output = "";
+ $output .= "
".t("Saved Playlists")." ";
+ $output .= "
";
+
+ $output .= "
".t("View Saved Playlist")." ".t("Playlist Info")."
\n";
+ $output .= "".t("Playlist Songs")."
\n";
+ $output .= "\n";
+
+ break;
+ case 'stats':
+ $query = "SELECT * FROM music_stats";
+ $result = mysql_query($query);
+ $row = mysql_fetch_array($result);
+ $query = "SELECT COUNT(play_id) AS songs FROM music_playhistory";
+ $result = mysql_query($query);
+ $row3 = mysql_fetch_array($result);
+
+ $output = "";
+ $output .= "
".t("Server Statistics")." ";
+ $output .= "\n";
+ $output .= "".t("Recently Added Albums")." ".t("Recently Played Songs")." ".t("Top Played Songs")."
\n";
+ $output .= "".t("Local Server Statistics")." \n";
+ $result = mysql_query("SELECT song_id from music_songs;");
+ $output .= "".t("Songs").": ". mysql_num_rows($result)."".t("Albums").": ". mysql_num_rows($result)."".t("Artists").": ". mysql_num_rows($result)."".t("Genres").": ". mysql_num_rows($result)."".t("Songs Played").": $row3[songs]
\n";
+
+ break;
+ case 'recentadd':
+ $query = "SELECT music_albums.album_name,music_albums.album_id,
+ music_artists.artist_name,
+ DATE_FORMAT(music_songs.date_entered,'%m.%d.%Y') as pubdate
+ FROM music_songs,music_albums,music_artists
+ WHERE music_songs.album_id=music_albums.album_id
+ AND music_artists.artist_id=music_songs.artist_id
+ GROUP BY music_songs.album_id ORDER BY music_songs.date_entered DESC LIMIT 40";
+ $result = mysql_query($query);
+
+ $output = "";
+ $output .= "
";
+ $output .= "
".t("Recently Added Albums")." ";
+ $count=1;
+ while($row = mysql_fetch_array($result)){
+ ($count%2 == 0 ? $alt = "class=\"alt\"" : $alt = '');
+ $output .= "$row[pubdate] $row[artist_name] - $row[album_name] ";
+
+
+ break;
+ case 'topplay':
+ $query = "SELECT music_albums.album_name, music_songs.numplays, music_songs.name,
+ music_artists.artist_name,music_songs.song_id
+ FROM music_songs,music_albums,music_artists
+ WHERE music_songs.album_id=music_albums.album_id
+ AND music_artists.artist_id=music_songs.artist_id
+ AND music_songs.numplays > 0
+ ORDER BY music_songs.numplays DESC LIMIT 40";
+ $result = mysql_query($query);
+
+ $output = "";
+ $output .= "
";
+ $output .= "
".t("Top Played Songs")." ";
+ $count=1;
+ while($row = mysql_fetch_array($result)){
+ ($count%2 == 0 ? $alt = "class=\"alt\"" : $alt = '');
+ $output .= "$row[numplays] ".t("Plays")." $row[artist_name] - $row[name] ";
+ break;
+ case 'recentplay':
+ $query = "SELECT music_songs.name, music_songs.song_id,
+ music_artists.artist_name,
+ DATE_FORMAT(music_playhistory.date_played,'%m.%d.%Y') as playdate
+ FROM music_songs,music_artists,music_playhistory
+ WHERE music_songs.song_id=music_playhistory.song_id
+ AND music_artists.artist_id=music_songs.artist_id
+ ORDER BY music_playhistory.play_id DESC LIMIT 40";
+ $result = mysql_query($query);
+
+ $output = "";
+ $output .= "
";
+ $output .= "
Recently Played Songs ";
+ $count=1;
+ while($row = mysql_fetch_array($result)){
+ ($count%2 == 0 ? $alt = "class=\"alt\"" : $alt = '');
+ $output .= "$row[playdate] $row[artist_name] - $row[name] ";
+
+
+ break;
+ }
+
+ return $output;
+
+}
+
+function getRandItems($type){
+ $options = '';
+ switch($type){
+ case 'artists':
+ $query = "SELECT * FROM music_artists ORDER BY artist_name";
+ $result = mysql_query($query);
+ while($row = mysql_fetch_array($result)){
+ $options .= "$row[artist_name] \n";
+ }
+ break;
+ case 'genre':
+ $query = "SELECT genre_id,genre FROM music_genres ORDER BY genre";
+ $result = mysql_query($query);
+ while($row = mysql_fetch_array($result)){
+ $options .= "$row[genre] \n";
+ }
+ break;
+ case 'albums':
+ $query = "SELECT music_albums.album_id,music_albums.album_name FROM music_albums ORDER BY album_name";
+ $result = mysql_query($query);
+ while($row = mysql_fetch_array($result)){
+ $options .= "$row[album_name] \n";
+ }
+ break;
+ case 'all':
+ return "$options ";
+}
+
+function searchMusic($terms,$option){
+ $query="SELECT music_songs.song_id, music_albums.album_name,music_songs.track,music_artists.artist_name,music_songs.name,SEC_TO_TIME(music_songs.length) as length
+ FROM music_songs,music_artists,music_albums WHERE music_songs.artist_id=music_artists.artist_id AND music_albums.album_id=music_songs.album_id AND ";
+ if($option == 'all')
+ $query .= "(music_songs.name LIKE '%$terms%' OR music_artists.artist_name LIKE '%$terms%' OR music_albums.album_name LIKE '%$terms%')";
+ elseif($option == 'artists')
+ $query .= "(music_artists.artist_name LIKE '%$terms%')";
+ elseif($option == 'albums')
+ $query .= "(music_albums.album_name LIKE '%$terms%')";
+ elseif($option == 'songs')
+ $query .= "(music_songs.name LIKE '%$terms%')";
+
+ $query .= " ORDER BY music_artists.artist_name,music_albums.album_name,music_songs.track";
+
+ $result = mysql_query($query);
+ $count = mysql_num_rows($result);
+
+ $output = "";
+ $output .= "
";
+ $output .= "
".t("Found")." $count ".t("Results for")." '$terms' Album: $row[album_name]
Playlist Saved as '".$pl_name."' ";
+ }
+ else
+ {
+ $arr = explode("@",$pl_name);
+ $query = "UPDATE music_saved_playlists SET playlist_songs = \"$songslist\", date_created = NOW(), time = $time, songcount = ".count($songs)." WHERE playlist_name = \"".$arr[0]."\" AND hostname = \"".$arr[1]."\"";
+ mysql_query($query);
+ return "Playlist '".$pl_name."' has been updated ";
+ }
+
+}
+
+function clearPlaylist(){
+ $query = "DELETE FROM music_playlist";
+ mysql_query($query);
+ return "Playlist is empty";
+}
+function deletePlaylist($id){
+ $query = "DELETE FROM music_saved_playlists WHERE playlist_id=$id";
+ mysql_query($query);
+ return 1;
+}
+
+function playlistInfo(){
+ $query = "SELECT COUNT(music_playlist.pl_id) as count, SEC_TO_TIME(SUM(music_songs.length)) as time FROM music_playlist,music_songs WHERE music_playlist.song_id=music_songs.song_id";
+ $result = mysql_query($query);
+ $row = mysql_fetch_array($result);
+ if($row['count'] == 0){
+ return "Playlist is empty";
+ }
+ return "$row[count] Songs - $row[time]";
+}
+
+function playlist_rem($itemid){
+ $id = substr($itemid, 2);
+ $query = "DELETE FROM music_playlist WHERE pl_id=$id";
+ mysql_query($query);
+ return $itemid;
+}
+
+function playlist_move($item1,$item2){
+ $item1 = substr($item1, 2);
+ $item2 = substr($item2, 2);
+ $row = array();
+ $query = "SELECT pl_id,song_id FROM music_playlist WHERE pl_id=$item1 OR pl_id=$item2";
+ $result = mysql_query($query);
+ while($row[] = mysql_fetch_array($result)){
+
+ }
+ $query = "UPDATE music_playlist SET song_id=" . $row[0]['song_id'] . " WHERE pl_id=" . $row[1]['pl_id'];
+ mysql_query($query);
+ $query = "UPDATE music_playlist SET song_id=" . $row[1]['song_id'] . " WHERE pl_id=" . $row[0]['pl_id'];
+
+ mysql_query($query);
+}
+
+function playlist_add($type,$itemid){
+
+ switch($type){
+ case 'song':
+ $query = "INSERT INTO music_playlist (song_id) VALUES (N$itemid)";
+ mysql_query($query);
+ $id = mysql_insert_id();
+ $query = "SELECT music_artists.artist_name, music_albums.album_name,SEC_TO_TIME(music_songs.length) AS length,music_songs.name,music_songs.track FROM music_artists,music_songs,music_albums WHERE music_songs.song_id=$itemid AND music_artists.artist_id=music_songs.artist_id AND music_albums.album_id=music_songs.album_id";
+ $result = mysql_query($query);
+ $row = mysql_fetch_array($result);
+
+ $output[] = "Album: $row[album_name]
Album: $row[album_name]
list;
Index: mythmusic/mythmusic/smartplaylist.cpp
===================================================================
--- mythmusic/mythmusic/smartplaylist.cpp (revision 9730)
+++ mythmusic/mythmusic/smartplaylist.cpp (working copy)
@@ -33,18 +33,20 @@
static SmartPLField SmartPLFields[] =
{
{ "", "", ftString, 0, 0, 0 },
- { "Artist", "artist", ftString, 0, 0, 0 },
- { "Album", "album", ftString, 0, 0, 0 },
- { "Title", "title", ftString, 0, 0, 0 },
- { "Genre", "genre", ftString, 0, 0, 0 },
- { "Year", "year", ftNumeric, 1900, 2099, 2000 },
- { "Track No.", "tracknum", ftNumeric, 0, 99, 0 },
- { "Rating", "rating", ftNumeric, 0, 10, 0 },
- { "Play Count", "playcount", ftNumeric, 0, 9999, 0 },
- { "Compilation", "compilation", ftBoolean, 0, 0, 0 },
- { "Comp. Artist", "compilation_artist", ftString, 0, 0, 0 },
- { "Last Play", "FROM_DAYS(TO_DAYS(lastplay))", ftDate, 0, 0, 0 },
- { "Date Imported", "FROM_DAYS(TO_DAYS(date_added))", ftDate, 0, 0, 0 },
+ { "Artist", "music_artists.artist_name", ftString, 0, 0, 0 },
+ { "Album", "music_songs.album_name", ftString, 0, 0, 0 },
+ { "Title", "music_songs.name", ftString, 0, 0, 0 },
+ { "Genre", "music_genres.genre", ftString, 0, 0, 0 },
+ { "Year", "music_songs.year", ftNumeric, 1900, 2099, 2000 },
+ { "Track No.", "music_songs.track", ftNumeric, 0, 99, 0 },
+ { "Rating", "music_songs.rating", ftNumeric, 0, 10, 0 },
+ { "Play Count", "music_songs.numplays", ftNumeric, 0, 9999, 0 },
+ { "Compilation", "music_songs.compilation", ftBoolean, 0, 0, 0 },
+ { "Comp. Artist", "music_comp_artists.artist_name", ftString, 0, 0, 0 },
+ { "Last Play", "FROM_DAYS(TO_DAYS(music_songs.lastplay))",
+ ftDate, 0, 0, 0 },
+ { "Date Imported", "FROM_DAYS(TO_DAYS(music_songs.date_added))",
+ ftDate, 0, 0, 0 },
};
struct SmartPLOperator
@@ -655,11 +657,28 @@
searchList.clear();
MSqlQuery query(MSqlQuery::InitCon());
- QString querystr;
- querystr = QString("SELECT DISTINCT %1 FROM musicmetadata ORDER BY %2").arg(field).arg(field);
+ if ("artist" == field || "compilation_artist" == field)
+ {
+ query.prepare("SELECT artist_name FROM music_artists ORDER BY artist_name;");
+ }
+ else if ("album" == field)
+ {
+ query.prepare("SELECT album_name FROM music_albums ORDER BY album_name;");
+ }
+ else if ("title" == field)
+ {
+ query.prepare("SELECT name FROM music_songs ORDER BY name;");
+ }
+ else if ("genre" == field)
+ {
+ query.prepare("SELECT genre FROM music_genres ORDER BY genre;");
+ }
+ else
+ {
+ return;
+ }
- query.exec(querystr);
- if (query.isActive() && query.numRowsAffected())
+ if (query.exec() && query.isActive() && query.numRowsAffected())
{
while (query.next())
{
@@ -815,7 +834,7 @@
}
MSqlQuery query(MSqlQuery::InitCon());
- query.prepare("INSERT INTO smartplaylistitem (smartplaylistid, field, operator,"
+ query.prepare("INSERT INTO music_smartplaylistitem (smartplaylistid, field, operator,"
" value1, value2)"
"VALUES (:SMARTPLAYLISTID, :FIELD, :OPERATOR, :VALUE1, :VALUE2);");
query.bindValue(":SMARTPLAYLISTID", smartPlaylistID);
@@ -1130,7 +1149,7 @@
{
bPlaylistIsValid = true;
- QString sql = "select count(*) from musicmetadata ";
+ QString sql = "select count(*) from music_songs ";
sql += getWhereClause();
MSqlQuery query(MSqlQuery::InitCon());
@@ -1177,7 +1196,7 @@
MSqlQuery query(MSqlQuery::InitCon());
// insert new smartplaylist
- query.prepare("INSERT INTO smartplaylist (name, categoryid, matchtype, orderby, limitto) "
+ query.prepare("INSERT INTO music_smartplaylist (name, categoryid, matchtype, orderby, limitto) "
"VALUES (:NAME, :CATEGORYID, :MATCHTYPE, :ORDERBY, :LIMIT);");
query.bindValue(":NAME", name.utf8());
query.bindValue(":CATEGORYID", categoryid);
@@ -1193,7 +1212,7 @@
// get smartplaylistid
int ID;
- query.prepare("SELECT smartplaylistid FROM smartplaylist "
+ query.prepare("SELECT smartplaylistid FROM music_smartplaylist "
"WHERE categoryid = :CATEGORYID AND name = :NAME;");
query.bindValue(":CATEGORYID", categoryid);
query.bindValue(":NAME", name.utf8());
@@ -1253,7 +1272,7 @@
int ID;
query.prepare("SELECT smartplaylistid, name, categoryid, matchtype, orderby, limitto "
- "FROM smartplaylist WHERE name = :NAME AND categoryid = :CATEGORYID;");
+ "FROM music_smartplaylist WHERE name = :NAME AND categoryid = :CATEGORYID;");
query.bindValue(":NAME", name.utf8());
query.bindValue(":CATEGORYID", categoryid);
if (query.exec())
@@ -1285,7 +1304,7 @@
uint rowCount;
query.prepare("SELECT field, operator, value1, value2 "
- "FROM smartplaylistitem WHERE smartplaylistid = :ID "
+ "FROM music_smartplaylistitem WHERE smartplaylistid = :ID "
"ORDER BY smartplaylistitemid;");
query.bindValue(":ID", ID);
if (!query.exec())
@@ -1392,7 +1411,7 @@
// insert new smartplaylistcategory
MSqlQuery query(MSqlQuery::InitCon());
- query.prepare("INSERT INTO smartplaylistcategory (name) "
+ query.prepare("INSERT INTO music_smartplaylistcategory (name) "
"VALUES (:NAME);");
query.bindValue(":NAME", categoryEdit->text().utf8());
@@ -1438,7 +1457,7 @@
// change the category
MSqlQuery query(MSqlQuery::InitCon());
- query.prepare("UPDATE smartplaylistcategory SET name = :NEW_CATEGORY "
+ query.prepare("UPDATE music_smartplaylistcategory SET name = :NEW_CATEGORY "
"WHERE name = :OLD_CATEGORY;");
query.bindValue(":OLD_CATEGORY", categoryCombo->currentText().utf8());
query.bindValue(":NEW_CATEGORY", categoryEdit->text().utf8());
@@ -1458,8 +1477,12 @@
QString SmartPlaylistEditor::getSQL(QString fields)
{
QString sql, whereClause, orderByClause, limitClause;
-
- sql = "SELECT " + fields + " FROM musicmetadata ";
+ sql = "SELECT " + fields + " FROM music_songs "
+ "LEFT JOIN music_artists ON music_songs.artist_id=music_artists.artist_id "
+ "LEFT JOIN music_artists AS music_comp_artists ON music_songs.compilationartist_id=music_comp_artists.artist_id "
+ "LEFT JOIN music_albums ON music_songs.album_id=music_albums.album_id "
+ "LEFT JOIN music_genres ON music_songs.genre_id=music_genres.genre_id ";
+
whereClause = getWhereClause();
orderByClause = getOrderByClause();
if (limitSpinEdit->value() > 0)
@@ -1506,7 +1529,7 @@
void SmartPlaylistEditor::showResultsClicked(void)
{
- QString sql = getSQL("intid, artist, album, title, genre, year, tracknum");
+ QString sql = getSQL("song_id, music_artists.artist_name, album_name, name, genre, year, track");
SmartPLResultViewer *resultViewer = new SmartPLResultViewer(gContext->GetMainWindow(), "resultviewer");
resultViewer->setSQL(sql);
@@ -1535,7 +1558,7 @@
categoryCombo->clear();
MSqlQuery query(MSqlQuery::InitCon());
- if (query.exec("SELECT name FROM smartplaylistcategory ORDER BY name;"))
+ if (query.exec("SELECT name FROM music_smartplaylistcategory ORDER BY name;"))
{
if (query.isActive() && query.numRowsAffected() > 0)
{
@@ -1563,7 +1586,7 @@
// get playlist ID
int ID;
- query.prepare("SELECT smartplaylistid FROM smartplaylist WHERE name = :NAME "
+ query.prepare("SELECT smartplaylistid FROM music_smartplaylist WHERE name = :NAME "
"AND categoryid = :CATEGORYID;");
query.bindValue(":NAME", name.utf8());
query.bindValue(":CATEGORYID", categoryid);
@@ -1588,13 +1611,13 @@
}
//delete smartplaylist items
- query.prepare("DELETE FROM smartplaylistitem WHERE smartplaylistid = :ID;");
+ query.prepare("DELETE FROM music_smartplaylistitem WHERE smartplaylistid = :ID;");
query.bindValue(":ID", ID);
if (!query.exec())
MythContext::DBError("Delete smartplaylist items", query);
//delete smartplaylist
- query.prepare("DELETE FROM smartplaylist WHERE smartplaylistid = :ID;");
+ query.prepare("DELETE FROM music_smartplaylist WHERE smartplaylistid = :ID;");
query.bindValue(":ID", ID);
if (!query.exec())
MythContext::DBError("Delete smartplaylist", query);
@@ -1610,7 +1633,7 @@
MSqlQuery query(MSqlQuery::InitCon());
//delete all smartplaylists with the selected category
- query.prepare("SELECT name FROM smartplaylist "
+ query.prepare("SELECT name FROM music_smartplaylist "
"WHERE categoryid = :CATEGORYID;");
query.bindValue(":CATEGORYID", categoryid);
if (!query.exec())
@@ -1629,7 +1652,7 @@
}
// delete the category
- query.prepare("DELETE FROM smartplaylistcategory WHERE categoryid = :ID;");
+ query.prepare("DELETE FROM music_smartplaylistcategory WHERE categoryid = :ID;");
query.bindValue(":ID", categoryid);
if (!query.exec())
MythContext::DBError("Delete smartplaylist category", query);
@@ -1642,7 +1665,7 @@
{
int ID;
MSqlQuery query(MSqlQuery::InitCon());
- query.prepare("SELECT categoryid FROM smartplaylistcategory "
+ query.prepare("SELECT categoryid FROM music_smartplaylistcategory "
"WHERE name = :CATEGORY;");
query.bindValue(":CATEGORY", category.utf8());
@@ -2023,7 +2046,7 @@
categoryCombo->clear();
MSqlQuery query(MSqlQuery::InitCon());
- if (query.exec("SELECT name FROM smartplaylistcategory ORDER BY name;"))
+ if (query.exec("SELECT name FROM music_smartplaylistcategory ORDER BY name;"))
{
if (query.isActive() && query.numRowsAffected() > 0)
{
@@ -2045,7 +2068,7 @@
listbox->clear();
MSqlQuery query(MSqlQuery::InitCon());
- query.prepare("SELECT name FROM smartplaylist WHERE categoryid = :CATEGORYID "
+ query.prepare("SELECT name FROM music_smartplaylist WHERE categoryid = :CATEGORYID "
"ORDER BY name;");
query.bindValue(":CATEGORYID", categoryid);
Index: mythmusic/mythmusic/metadata.h
===================================================================
--- mythmusic/mythmusic/metadata.h (revision 9730)
+++ mythmusic/mythmusic/metadata.h (working copy)
@@ -18,7 +18,7 @@
Metadata(QString lfilename = "", QString lartist = "", QString lcompilation_artist = "",
QString lalbum = "", QString ltitle = "", QString lgenre = "",
int lyear = 0, int ltracknum = 0, int llength = 0, int lid = 0,
- int lrating = 0, int lplaycount = 0, QString llastplay = "",
+ int lrating = 0, int lplaycount = 0, int lbitrate = 0, int lfilesize = 0, QString llastplay = "",
bool lcompilation = false, QString lformat="")
{
filename = lfilename;
@@ -35,6 +35,8 @@
id = lid;
rating = lrating;
playcount = lplaycount;
+ bitrate = lbitrate;
+ filesize = lfilesize;
lastplay = llastplay;
compilation = lcompilation;
changed = false;
@@ -59,6 +61,8 @@
rating = other.rating;
lastplay = other.lastplay;
playcount = other.playcount;
+ bitrate = other.bitrate;
+ filesize = other.filesize;
compilation = other.compilation;
show = other.show;
changed = false;
@@ -97,6 +101,12 @@
int Playcount() { return playcount; }
void setPlaycount(int lplaycount) { playcount = lplaycount; }
+ int Bitrate() { return bitrate; }
+ void setBitrate(int lbitrate) { bitrate = lbitrate; }
+
+ int Filesize() { return filesize; }
+ void setFilesize(int lfilesize) { filesize = lfilesize; }
+
unsigned int ID() { return id; }
void setID(int lid) { id = lid; }
@@ -158,6 +168,8 @@
int rating;
QString lastplay;
int playcount;
+ int bitrate;
+ int filesize;
bool compilation;
unsigned int id;
Index: mythmusic/mythmusic/editmetadata.cpp
===================================================================
--- mythmusic/mythmusic/editmetadata.cpp (revision 9730)
+++ mythmusic/mythmusic/editmetadata.cpp (working copy)
@@ -368,14 +368,30 @@
{
searchList.clear();
- QString querystr;
- querystr = QString("SELECT DISTINCT %1 FROM musicmetadata ORDER BY %2").arg(field).arg(field);
-
MSqlQuery query(MSqlQuery::InitCon());
- query.exec(querystr);
-
- if (query.isActive() && query.size())
+ if ("artist" == field || "compilation_artist" == field)
{
+ query.prepare("SELECT artist_name FROM music_artists ORDER BY artist_name;");
+ }
+ else if ("album" == field)
+ {
+ query.prepare("SELECT album_name FROM music_albums ORDER BY album_name;");
+ }
+ else if ("title" == field)
+ {
+ query.prepare("SELECT name FROM music_songs ORDER BY name;");
+ }
+ else if ("genre" == field)
+ {
+ query.prepare("SELECT genre FROM music_genres ORDER BY genre;");
+ }
+ else
+ {
+ return;
+ }
+
+ if (query.exec() && query.isActive() && query.size())
+ {
while (query.next())
{
searchList << QString::fromUtf8(query.value(0).toString());
Index: mythmusic/mythmusic/main.cpp
===================================================================
--- mythmusic/mythmusic/main.cpp (revision 9730)
+++ mythmusic/mythmusic/main.cpp (working copy)
@@ -76,6 +76,8 @@
{
Metadata *data = decoder->getMetadata();
if (data) {
+ QFileInfo fi1( filename );
+ data->setFilesize( fi1.size() );
data->dumpToDatabase();
delete data;
}
@@ -90,7 +92,7 @@
QString name(filename);
name.remove(0, directory.length());
MSqlQuery query(MSqlQuery::InitCon());
- query.prepare("DELETE FROM musicmetadata WHERE "
+ query.prepare("DELETE FROM music_songs WHERE "
"filename = :NAME ;");
query.bindValue(":NAME", filename.utf8());
query.exec();
@@ -260,7 +262,7 @@
MSqlQuery query(MSqlQuery::InitCon());
query.exec("SELECT filename, date_modified "
- "FROM musicmetadata "
+ "FROM music_songs "
"WHERE filename NOT LIKE ('%://%')");
int counter = 0;
@@ -558,7 +560,7 @@
MSqlQuery count_query(MSqlQuery::InitCon());
- count_query.exec("SELECT COUNT(*) FROM musicmetadata;");
+ count_query.exec("SELECT COUNT(*) FROM music_songs;");
bool musicdata_exists = false;
if (count_query.isActive())
Index: mythmusic/mythmusic/metaioid3v2.cpp
===================================================================
--- mythmusic/mythmusic/metaioid3v2.cpp (revision 9730)
+++ mythmusic/mythmusic/metaioid3v2.cpp (working copy)
@@ -174,7 +174,7 @@
{
QString artist = "", compilation_artist = "", album = "", title = "",
genre = "";
- int year = 0, tracknum = 0, length = 0;
+ int year = 0, tracknum = 0, length = 0, bitrate = 0;
bool compilation = false;
id3_file *p_input = NULL;
@@ -251,6 +251,7 @@
}
length = getTrackLength(filename);
+ bitrate = getTrackBitRate(filename);
// If we don't have title and artist or don't have the length return NULL
if ((title.isEmpty() && artist.isEmpty()) || length<=0)
@@ -261,7 +262,8 @@
}
Metadata *retdata = new Metadata(filename, artist, compilation_artist, album,
- title, genre, year, tracknum, length);
+ title, genre, year, tracknum, length, 0, 0,
+ 0, bitrate);
retdata->setCompilation(compilation);
@@ -378,7 +380,113 @@
return alt_length;
}
+//==========================================================================
+/*!
+ * \brief Find the bitrate of the track (in bytes/sek)
+ *
+ * \param filename The filename for which we want to find the length.
+ * \returns An integer to represent the bitrate.
+ */
+int MetaIOID3v2::getTrackBitRate(QString filename)
+{
+ struct mad_stream stream;
+ struct mad_header header;
+ mad_timer_t timer;
+ unsigned char buffer[8192];
+ unsigned int buflen = 0;
+
+ mad_stream_init(&stream);
+ mad_header_init(&header);
+
+ timer = mad_timer_zero;
+
+ FILE *input = fopen(filename.local8Bit(), "r");
+ if (!input)
+ input = fopen(filename.ascii(), "r");
+
+ if (!input)
+ return 0;
+
+ struct stat s;
+ fstat(fileno(input), &s);
+ unsigned long old_bitrate = 0;
+ bool vbr = false;
+ int amount_checked = 0;
+ bool loop_de_doo = true;
+
+ while (loop_de_doo)
+ {
+ if (buflen < sizeof(buffer))
+ {
+ int bytes;
+ bytes = fread(buffer + buflen, 1, sizeof(buffer) - buflen, input);
+ if (bytes <= 0)
+ break;
+ buflen += bytes;
+ }
+
+ mad_stream_buffer(&stream, buffer, buflen);
+
+ while (1)
+ {
+ if (mad_header_decode(&header, &stream) == -1)
+ {
+ if (!MAD_RECOVERABLE(stream.error))
+ {
+ break;
+ }
+ if (stream.error == MAD_ERROR_LOSTSYNC)
+ {
+ int tagsize = id3_tag_query(stream.this_frame,
+ stream.bufend -
+ stream.this_frame);
+ if (tagsize > 0)
+ {
+ mad_stream_skip(&stream, tagsize);
+ s.st_size -= tagsize;
+ }
+ }
+ }
+ else
+ {
+ if(amount_checked == 0)
+ {
+ old_bitrate = header.bitrate;
+ }
+ else if(header.bitrate != old_bitrate)
+ {
+ vbr = true;
+ }
+ if(amount_checked == 32 && !vbr)
+ {
+ loop_de_doo = false;
+ break;
+ }
+ amount_checked++;
+ mad_timer_add(&timer, header.duration);
+ }
+
+ }
+
+ if (stream.error != MAD_ERROR_BUFLEN)
+ break;
+
+ memmove(buffer, stream.next_frame, &buffer[buflen] - stream.next_frame);
+ buflen -= stream.next_frame - &buffer[0];
+ }
+
+ mad_header_finish(&header);
+ mad_stream_finish(&stream);
+
+ fclose(input);
+
+// if (vbr)
+// return mad_timer_count(timer, MAD_UNITS_MILLISECONDS);
+
+ return old_bitrate;
+}
+
inline QString MetaIOID3v2::getRawID3String(union id3_field *pField)
{
QString tmp = "";
![](\"".pic_dir()."add.gif\")
![](\"".pic_dir()."play.gif\")
" . $row['album_name'] . " \n";
+
+ $count++;
+ }
+ $output .= "![](\"".pic_dir()."rem.gif\")
"." $row[playlist_name] - $row[songcount] ".t("Songs")." ($row[time2]) ";
+ else
+ $output .= "![](\"".pic_dir()."up.gif\")
![](\"".pic_dir()."down.gif\")