Piers qq

addons/resource.language.en_gb/resources/strings.po

@@ -15167,7 +15167,26 @@ msgctxt "#21485"
 msgid "Supported file extensions and media types"
 msgstr ""
 
-#empty strings from id 21486 to 21601
+#: xbmc/dialogs/GUIDialogMediaFilter.cpp
+#: xbmc/playlist/SmartPlayList.cpp
+msgctxt "#21486"
+msgid "Music concerts"
+msgstr ""
+
+#. Boolean value to include/exclude audiobooks in the filter or smartplaylist
+#: xbmc/dialogs/GUIDialogMediaFilter.cpp
+#: xbmc/playlist/SmartPlayList.cpp
+msgctxt "#21487"
+msgid "Audiobook"
+msgstr ""
+
+#. Plural of #21487 - for display on screen in the associated node name
+#: system/library/music/audiobook.xml
+msgctxt "#21488"
+msgid "Audiobooks"
+msgstr ""
+
+#empty strings from id 21489 to 21601
 
 #: xbmc/Util.cpp
 msgctxt "#21602"

addons/skin.estuary/xml/Includes.xml

@@ -403,6 +403,21 @@
 				<itemgap>9</itemgap>
 				<width>1900</width>
 				<usecontrolcoords>true</usecontrolcoords>
+				<control type="group">
+					<width>115</width>
+					<visible>!String.IsEmpty(ListItem.MusicCodec)</visible>
+					<control type="label">
+						<width>110</width>
+						<height>60</height>
+						<align>center</align>
+						<aligny>center</aligny>
+						<label>$INFO[$PARAM[infolabel_prefix]ListItem.MusicCodec]</label>
+						<font>font_flag</font>
+					</control>
+					<include content="MediaFlag">
+						<param name="texture" value="flags/flag.png" />
+					</include>
+				</control>
 				<include content="MediaFlag">
 					<param name="flag_visible" value="VideoPlayer.IsStereoscopic" />
 					<param name="flag_label" value="3D" />
@@ -517,6 +532,82 @@
 					<param name="flag_visible" value="!String.IsEmpty(MusicPlayer.BMP)" />
 					<param name="flag_label" value="$INFO[MusicPlayer.BMP, ,bpm]" />
 				</include>
+				<control type="group">
+					<visible>!String.IsEmpty(ListItem.Samplerate)</visible>
+					<width>115</width>
+					<control type="label">
+						<width>110</width>
+						<height>60</height>
+						<align>center</align>
+						<aligny>center</aligny>
+						<label>$INFO[ListItem.Samplerate, ,kHz]</label>
+						<font>font_flag</font>
+					</control>
+					<include content="MediaFlag">
+						<param name="texture" value="flags/flag.png" />
+					</include>
+				</control>
+				<control type="group">
+					<visible>!String.IsEmpty(ListItem.BitRate)</visible>
+					<width>115</width>
+					<control type="label">
+						<width>110</width>
+						<height>60</height>
+						<align>center</align>
+						<aligny>center</aligny>
+						<label>$INFO[ListItem.BitRate, ,kbps]</label>
+						<font>font_flag</font>
+					</control>
+					<include content="MediaFlag">
+						<param name="texture" value="flags/flag.png" />
+					</include>
+				</control>
+				<control type="group">
+					<visible>!String.IsEmpty(ListItem.MusicBitsPerSample)</visible>
+					<width>115</width>
+					<control type="label">
+						<width>110</width>
+						<height>60</height>
+						<align>center</align>
+						<aligny>center</aligny>
+						<label>$INFO[ListItem.MusicBitsPerSample, ,bit]</label>
+						<font>font_flag</font>
+					</control>
+					<include content="MediaFlag">
+						<param name="texture" value="flags/flag.png" />
+					</include>
+				</control>
+				<control type="group">
+					<visible>!String.IsEmpty(ListItem.BPM)</visible>
+					<width>115</width>
+					<control type="label">
+						<width>110</width>
+						<height>60</height>
+						<align>center</align>
+						<aligny>center</aligny>
+						<label>$INFO[ListItem.BPM, ,bpm]</label>
+						<font>font_flag</font>
+					</control>
+					<include content="MediaFlag">
+						<param name="texture" value="flags/flag.png" />
+					</include>
+				</control>
+				<control type="group">
+					<width>115</width>
+					<visible>!String.IsEmpty($PARAM[infolabel_prefix]ListItem.Duration)</visible>
+					<visible>Container.Content(albums) + ![Window.IsVisible(songinformation) | Window.IsVisible(musicinformation)]</visible>
+					<control type="label">
+						<width>110</width>
+						<height>60</height>
+						<align>center</align>
+						<aligny>center</aligny>
+						<label>$INFO[$PARAM[infolabel_prefix]ListItem.Duration]</label>
+						<font>font_flag</font>
+					</control>
+					<include content="MediaFlag">
+						<param name="texture" value="flags/flag.png" />
+					</include>
+				</control>
 			</control>
 		</definition>
 	</include>

system/library/music/audiobooks.xml

@@ -0,0 +1,7 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<node order="38" type="filter" visible="Library.HasContent(AudioBooks)">
+    <label>21488</label>
+    <content>albums</content>
+    <order direction="ascending">album</order>
+     <rule field="isaudiobook" operator="true" />
+</node>

system/library/music/musicconcerts.xml

@@ -0,0 +1,6 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<node order="38" type="filter" visible="Library.HasContent(MusicConcerts)">
+    <label>21486</label>
+    <content>albums</content>
+    <rule field="ismusicconcert" operator="true" />
+</node>

xbmc/FileItem.cpp

@@ -830,6 +830,21 @@ bool CFileItem::IsDeleted() const
   return false;
 }
 
+bool CFileItem::IsAudioBook() const
+{
+  return IsType(".m4b");
+}
+
+bool CFileItem::IsMatroskaAudio() const
+{
+  return IsType(".mka|.mp4");
+}
+
+bool CFileItem::IsMatroskaVideo() const
+{
+  return IsType(".mkv");
+}
+
 bool CFileItem::IsGame() const
 {
   if (HasGameInfoTag())
@@ -898,8 +913,8 @@ bool CFileItem::IsFileFolder(FileFolderType types) const
     if (PLAYLIST::IsSmartPlayList(*this) ||
         (PLAYLIST::IsPlayList(*this) &&
          CServiceBroker::GetSettingsComponent()->GetAdvancedSettings()->m_playlistAsFolders) ||
-        IsAPK() || IsZIP() || IsRAR() || IsRSS() || URIUtils::IsArchive(GetURL()) ||
-        MUSIC::IsAudioBook(*this) ||
+        IsAPK() || IsZIP() || IsRAR() || IsRSS() || MUSIC::IsAudioBook(*this) || IsMatroskaAudio() || IsMatroskaVideo() || IsType(".mp4") ||
+
 #if defined(TARGET_ANDROID)
         IsType(".apk") ||
 #endif

xbmc/FileItem.h

@@ -154,6 +154,14 @@ class CFileItem : public CGUIListItem, public IArchivable, public ISerializable,
    */
   bool IsDeleted() const;
 
+  /*!
+   \brief Check whether an item is an audio book item.
+   \return true if item is audiobook, false otherwise.
+   */
+  bool IsAudioBook() const;
+  bool IsMatroskaAudio() const;
+  bool IsMatroskaVideo() const;
+
   bool IsGame() const;
   bool IsLibraryFolder() const;
   bool IsPythonScript() const;