Move src/lyrics to src/songinfo

src/CMakeLists.txt

@@ -84,14 +84,6 @@ set(SOURCES
   library/librarywatcher.cpp
   library/sqlrow.cpp
 
-  lyrics/htmlscraper.cpp
-  lyrics/lyricfetcher.cpp
-  lyrics/lyricprovider.cpp
-  lyrics/lyricsettings.cpp
-  lyrics/lyricview.cpp
-  lyrics/songinfobase.cpp
-  lyrics/ultimatelyricsreader.cpp
-
   playlist/playlist.cpp
   playlist/playlistbackend.cpp
   playlist/playlistcontainer.cpp
@@ -135,6 +127,14 @@ set(SOURCES
   radio/savedradio.cpp
   radio/somafmservice.cpp
 
+  songinfo/htmlscraper.cpp
+  songinfo/lyricfetcher.cpp
+  songinfo/lyricprovider.cpp
+  songinfo/lyricsettings.cpp
+  songinfo/lyricview.cpp
+  songinfo/songinfobase.cpp
+  songinfo/ultimatelyricsreader.cpp
+
   ui/about.cpp
   ui/addstreamdialog.cpp
   ui/albumcovermanager.cpp
@@ -220,14 +220,6 @@ set(HEADERS
   library/libraryviewcontainer.h
   library/librarywatcher.h
 
-  lyrics/htmlscraper.h
-  lyrics/lyricfetcher.h
-  lyrics/lyricprovider.h
-  lyrics/lyricsettings.h
-  lyrics/lyricview.h
-  lyrics/songinfobase.h
-  lyrics/ultimatelyricsreader.h
-
   playlist/playlist.h
   playlist/playlistbackend.h
   playlist/playlistcontainer.h
@@ -265,6 +257,14 @@ set(HEADERS
   radio/savedradio.h
   radio/somafmservice.h
 
+  songinfo/htmlscraper.h
+  songinfo/lyricfetcher.h
+  songinfo/lyricprovider.h
+  songinfo/lyricsettings.h
+  songinfo/lyricview.h
+  songinfo/songinfobase.h
+  songinfo/ultimatelyricsreader.h
+
   ui/about.h
   ui/addstreamdialog.h
   ui/albumcovermanager.h
@@ -311,9 +311,6 @@ set(UI
   library/libraryfilterwidget.ui
   library/libraryviewcontainer.ui
 
-  lyrics/lyricsettings.ui
-  lyrics/lyricview.ui
-
   playlist/playlistcontainer.ui
   playlist/playlistsequence.ui
   playlist/queuemanager.ui
@@ -324,6 +321,9 @@ set(UI
   radio/magnatunedownloaddialog.ui
   radio/radioviewcontainer.ui
 
+  songinfo/lyricsettings.ui
+  songinfo/lyricview.ui
+
   ui/about.ui
   ui/addstreamdialog.ui
   ui/albumcovermanager.ui

src/ui/mainwindow.cpp

@@ -38,8 +38,6 @@
 #include "library/librarydirectorymodel.h"
 #include "library/libraryfilterwidget.h"
 #include "library/libraryviewcontainer.h"
-#include "lyrics/lyricfetcher.h"
-#include "lyrics/lyricview.h"
 #include "playlist/playlistbackend.h"
 #include "playlist/playlist.h"
 #include "playlist/playlistmanager.h"
@@ -56,6 +54,8 @@
 #include "radio/radioview.h"
 #include "radio/radioviewcontainer.h"
 #include "radio/savedradio.h"
+#include "songinfo/lyricfetcher.h"
+#include "songinfo/lyricview.h"
 #include "transcoder/transcodedialog.h"
 #include "ui/about.h"
 #include "ui/addstreamdialog.h"

src/ui/mainwindow.ui

@@ -781,7 +781,7 @@
   <customwidget>
    <class>LyricView</class>
    <extends>QWidget</extends>
-   <header>lyrics/lyricview.h</header>
+   <header>songinfo/lyricview.h</header>
    <container>1</container>
   </customwidget>
  </customwidgets>

src/ui/settingsdialog.ui

@@ -765,7 +765,7 @@
   <customwidget>
    <class>LyricSettings</class>
    <extends>QWidget</extends>
-   <header>lyrics/lyricsettings.h</header>
+   <header>songinfo/lyricsettings.h</header>
    <container>1</container>
   </customwidget>
  </customwidgets>