From 6a03ec0f303aa1d98621728e4ec6b00ded3a35ad Mon Sep 17 00:00:00 2001 From: jmarshallnz Date: Sat, 14 Nov 2009 02:38:49 +0000 Subject: changed: Sanitized the music settings. git-svn-id: https://xbmc.svn.sourceforge.net/svnroot/xbmc/trunk@24581 568bbfeb-2a22-0410-94d2-cc84cf5bfa90 --- guilib/GUIVisualisationControl.cpp | 4 +- language/English/strings.xml | 38 ++++++++-------- xbmc/Application.cpp | 4 +- xbmc/Autorun.cpp | 6 +-- .../MusicDatabaseDirectory/DirectoryNodeArtist.cpp | 2 +- xbmc/FileSystem/ShoutcastRipFile.cpp | 6 +-- xbmc/FileSystem/SpecialProtocol.cpp | 6 +-- xbmc/GUIDialogMediaSource.cpp | 8 +--- xbmc/GUIDialogMusicOSD.cpp | 6 +-- xbmc/GUIDialogVisualisationPresetList.cpp | 2 +- xbmc/GUISettings.cpp | 50 +++++++++------------- xbmc/GUIViewStateMusic.cpp | 4 +- xbmc/GUIViewStateVideo.cpp | 2 +- xbmc/GUIWindowMusicBase.cpp | 2 +- xbmc/GUIWindowSettingsCategory.cpp | 24 +++++------ xbmc/GUIWindowVideoBase.cpp | 5 ++- xbmc/MediaManager.cpp | 2 +- xbmc/MusicDatabase.cpp | 2 +- xbmc/cdrip/CDDARipper.cpp | 10 ++--- xbmc/cdrip/EncoderLame.cpp | 6 +-- xbmc/cdrip/EncoderVorbis.cpp | 10 ++--- xbmc/utils/GUIInfoManager.cpp | 4 +- 22 files changed, 95 insertions(+), 108 deletions(-) diff --git a/guilib/GUIVisualisationControl.cpp b/guilib/GUIVisualisationControl.cpp index 3cbdb9d25a..3e388519a7 100644 --- a/guilib/GUIVisualisationControl.cpp +++ b/guilib/GUIVisualisationControl.cpp @@ -141,7 +141,7 @@ void CGUIVisualisationControl::LoadVisualisation() CVisualisationFactory factory; CStdString strVisz, strModule; - m_currentVis = g_guiSettings.GetString("mymusic.visualisation"); + m_currentVis = g_guiSettings.GetString("musicplayer.visualisation"); if (m_currentVis.Equals("None")) return; @@ -222,7 +222,7 @@ void CGUIVisualisationControl::Render() CGUIControl::Render(); return; } - else if (!m_currentVis.Equals(g_guiSettings.GetString("mymusic.visualisation"))) + else if (!m_currentVis.Equals(g_guiSettings.GetString("musicplayer.visualisation"))) { // vis changed - reload LoadVisualisation(); diff --git a/language/English/strings.xml b/language/English/strings.xml index 485b6acdaa..8bb8583862 100644 --- a/language/English/strings.xml +++ b/language/English/strings.xml @@ -167,7 +167,7 @@ Speed Test patterns... - Lookup audio CDs on the Internet + Lookup audio CD track names from freedb.org Shuffle playlist on load HDD spindown time Video filters @@ -417,7 +417,7 @@ Repeat Repeat one Repeat folder - Auto play next item + Play the next song automatically - Use big icons Resize VobSubs Advanced options (Experts Only!) @@ -531,7 +531,7 @@ Rip audio track Enter number - CD Ripping + Audio CDs Encoder Quality Bitrate @@ -546,7 +546,7 @@ Original Size Custom Replay gain - Replay gain mode + Apply Replaygain volume adjustments Use track levels Use album levels PreAmp Level - Replay gained files @@ -1120,7 +1120,7 @@ Float effect Black bar reduction Restart - Crossfade + Crossfade between songs Regenerate thumbnails Recursive thumbnails View slideshow @@ -1179,7 +1179,7 @@ Voice mask - Port 3 Voice mask - Port 4 Use time based seeking - Track naming template right + Track naming template - right Preset There are no presets available for this visualization There are no settings available for this visualization @@ -1192,7 +1192,7 @@ Enable subtitles Shortcuts Ignore tokens when sorting - Crossfade album tracks + Crossfade between songs on the same album Browse for %s Show track position Clear default @@ -1206,7 +1206,7 @@ Minimum fan speed Downloading - Hide artists who appear only on compilations + Show artists who appear only on compilations Render method Auto detect Basic shaders (ARB) @@ -1298,7 +1298,7 @@ Stop scan Not possible while scanning for media info Film grain effect - Look for thumbs on remote shares + Search for thumbnails on remote shares Unknown type cache - Internet Auto Enter username for @@ -1324,6 +1324,8 @@ Show EXIF picture information Use a fullscreen window rather than true fullscreen mode Queue songs on selection + Play audio CDs automatically + Playback @@ -1421,9 +1423,9 @@ Libre.fm username Libre.fm password Libre.fm - Scrobbler + Song submission - Submit Last.fm Radio to Last.fm + Submit Last.fm radio to Last.fm Connecting to Last.fm... Selecting station... Search similar artists... @@ -1557,12 +1559,12 @@ Switch to channel - CDDA rip folder + Saved music folder Use external DVD player External DVD player Trainers folder Screenshot folder - Recordings folder + Playlists folder Recordings Screenshots @@ -1742,9 +1744,9 @@ Enable auto scrolling for plot & review Custom Enable debug logging - Download additional info on library updates + Download additional information during updates - Default scraper + Default service for music information Change scraper Export music library Import music library @@ -1977,7 +1979,7 @@ Default tvshow scraper Default musicvideo scraper Enable fallback based on scraper language - - Scraper settings + - Settings Multilingual Value to match @@ -2069,7 +2071,7 @@ Reference service Allow UPnP controllers to control XBMC Attempt to skip introduction before DVD menu - Ripped audio CDs + Saved music Query info for all artists Downloading album information Downloading artist information @@ -2124,7 +2126,7 @@ Export karaoke titles as HTML Export karaoke titles as CSV Import karaoke titles... - Auto popup song selector + Show song selector automatically Export karaoke titles... Enter song number white/green diff --git a/xbmc/Application.cpp b/xbmc/Application.cpp index d992e3bea9..af0c68773e 100644 --- a/xbmc/Application.cpp +++ b/xbmc/Application.cpp @@ -1081,7 +1081,7 @@ HRESULT CApplication::Initialize() CLog::Log(LOGINFO, "creating subdirectories"); CLog::Log(LOGINFO, "userdata folder: %s", g_settings.GetProfileUserDataFolder().c_str()); - CLog::Log(LOGINFO, "recording folder:%s", g_guiSettings.GetString("mymusic.recordingpath",false).c_str()); + CLog::Log(LOGINFO, "recording folder:%s", g_guiSettings.GetString("audiocds.recordingpath",false).c_str()); CLog::Log(LOGINFO, "screenshots folder:%s", g_guiSettings.GetString("system.screenshotpath",false).c_str()); // UserData folder layout: @@ -4366,7 +4366,7 @@ void CApplication::ActivateScreenSaver(bool forceType /*= false */) if (g_windowManager.HasModalDialog() || (IsPlayingVideo() && g_guiSettings.GetBool("screensaver.usedimonpause"))) m_screenSaverMode = "Dim"; // Check if we are Playing Audio and Vis instead Screensaver! - else if (IsPlayingAudio() && g_guiSettings.GetBool("screensaver.usemusicvisinstead") && g_guiSettings.GetString("mymusic.visualisation") != "None") + else if (IsPlayingAudio() && g_guiSettings.GetBool("screensaver.usemusicvisinstead") && g_guiSettings.GetString("musicplayer.visualisation") != "None") { // activate the visualisation m_screenSaverMode = "Visualisation"; g_windowManager.ActivateWindow(WINDOW_VISUALISATION); diff --git a/xbmc/Autorun.cpp b/xbmc/Autorun.cpp index b5da1cdbad..35dd23b9ee 100644 --- a/xbmc/Autorun.cpp +++ b/xbmc/Autorun.cpp @@ -70,7 +70,7 @@ void CAutorun::ExecuteAutorun( bool bypassSettings, bool ignoreplaying ) if ( pInfo->IsAudio( 1 ) ) { - if( !bypassSettings && !g_guiSettings.GetBool("autorun.cdda") && !g_guiSettings.GetBool("lookandfeel.autorun") ) + if( !bypassSettings && !g_guiSettings.GetBool("autorun.cdda") && !g_guiSettings.GetBool("audiocds.autorun") ) return; if (!g_passwordManager.IsMasterLockUnlocked(false)) @@ -104,7 +104,7 @@ void CAutorun::RunCdda() void CAutorun::RunMedia(bool bypassSettings) { - if ( !bypassSettings && !g_guiSettings.GetBool("autorun.dvd") && !g_guiSettings.GetBool("autorun.vcd") && !g_guiSettings.GetBool("autorun.video") && !g_guiSettings.GetBool("autorun.music") && !g_guiSettings.GetBool("autorun.pictures") && !g_guiSettings.GetBool("lookandfeel.autorun")) + if ( !bypassSettings && !g_guiSettings.GetBool("autorun.dvd") && !g_guiSettings.GetBool("autorun.vcd") && !g_guiSettings.GetBool("autorun.video") && !g_guiSettings.GetBool("autorun.music") && !g_guiSettings.GetBool("autorun.pictures") && !g_guiSettings.GetBool("audiocds.autorun") && !g_guiSettings.GetBool("lookandfeel.autorun")) return ; int nSize = g_playlistPlayer.GetPlaylist( PLAYLIST_MUSIC ).size(); @@ -258,7 +258,7 @@ bool CAutorun::RunDisc(IDirectory* pDir, const CStdString& strDrive, int& nAdded } } // then music - if (!bPlaying && (bypassSettings || g_guiSettings.GetBool("autorun.music") || g_guiSettings.GetBool("lookandfeel.autorun")) && bAllowMusic) + if (!bPlaying && (bypassSettings || g_guiSettings.GetBool("autorun.music") || g_guiSettings.GetBool("audiocds.autorun")) && bAllowMusic) { for (int i = 0; i < vecItems.Size(); i++) { diff --git a/xbmc/FileSystem/MusicDatabaseDirectory/DirectoryNodeArtist.cpp b/xbmc/FileSystem/MusicDatabaseDirectory/DirectoryNodeArtist.cpp index dbf8aa189e..b22bd3aae5 100644 --- a/xbmc/FileSystem/MusicDatabaseDirectory/DirectoryNodeArtist.cpp +++ b/xbmc/FileSystem/MusicDatabaseDirectory/DirectoryNodeArtist.cpp @@ -46,7 +46,7 @@ bool CDirectoryNodeArtist::GetContent(CFileItemList& items) CQueryParams params; CollectQueryParams(params); - bool bSuccess = musicdatabase.GetArtistsNav(BuildPath(), items, params.GetGenreId(), g_guiSettings.GetBool("musiclibrary.albumartistsonly")); + bool bSuccess = musicdatabase.GetArtistsNav(BuildPath(), items, params.GetGenreId(), !g_guiSettings.GetBool("musiclibrary.showcompilationartists")); musicdatabase.Close(); diff --git a/xbmc/FileSystem/ShoutcastRipFile.cpp b/xbmc/FileSystem/ShoutcastRipFile.cpp index fa74d71cd3..fa16c92de8 100644 --- a/xbmc/FileSystem/ShoutcastRipFile.cpp +++ b/xbmc/FileSystem/ShoutcastRipFile.cpp @@ -158,7 +158,7 @@ bool CShoutcastRipFile::Record() if ( m_logFile == NULL ) //will be done only the first time or if path not set! { char logFilename[1024]; - CStdString strHomePath = g_guiSettings.GetString("mymusic.recordingpath"); + CStdString strHomePath = g_guiSettings.GetString("audiocds.recordingpath"); #ifndef _LINUX sprintf(logFilename, "%s\\recordings.log", strHomePath.c_str() ); #else @@ -276,7 +276,7 @@ void CShoutcastRipFile::PrepareRecording( ) //The filename of RM will be something like "Oasis - Champagne Supernova", thus //So, we will make a file i.e "f:music\Record\Limbik Frequencies\Oasis - Champagne Supernova.mp3" - CStdString strHomePath = g_guiSettings.GetString("mymusic.recordingpath"); + CStdString strHomePath = g_guiSettings.GetString("audiocds.recordingpath"); char szFilePath[1024]; #ifndef _LINUX sprintf( szFilePath, "%s\\%s", strHomePath.c_str(), directoryName ); @@ -330,7 +330,7 @@ void CShoutcastRipFile::PrepareRecording( ) else { //here we will make a file i.e "f:music\Record\Jazzmusique\Jazzmusique - 3.mp3" - CStdString strHomePath = g_guiSettings.GetString("mymusic.recordingpath"); + CStdString strHomePath = g_guiSettings.GetString("audiocds.recordingpath"); char szFilePath[1024]; char szTitle[1124]; //i.e. diff --git a/xbmc/FileSystem/SpecialProtocol.cpp b/xbmc/FileSystem/SpecialProtocol.cpp index a91fdb5bea..744e033359 100644 --- a/xbmc/FileSystem/SpecialProtocol.cpp +++ b/xbmc/FileSystem/SpecialProtocol.cpp @@ -119,16 +119,14 @@ CStdString CSpecialProtocol::TranslatePath(const CStdString &path) CUtil::AddFileToFolder(g_settings.GetDatabaseFolder(), FileName, translatedPath); else if (RootDir.Equals("thumbnails")) CUtil::AddFileToFolder(g_settings.GetThumbnailsFolder(), FileName, translatedPath); - else if (RootDir.Equals("recordings")) - CUtil::AddFileToFolder(g_guiSettings.GetString("mymusic.recordingpath", false), FileName, translatedPath); + else if (RootDir.Equals("recordings") || RootDir.Equals("cdrips")) + CUtil::AddFileToFolder(g_guiSettings.GetString("audiocds.recordingpath", false), FileName, translatedPath); else if (RootDir.Equals("screenshots")) CUtil::AddFileToFolder(g_guiSettings.GetString("system.screenshotpath", false), FileName, translatedPath); else if (RootDir.Equals("musicplaylists")) CUtil::AddFileToFolder(CUtil::MusicPlaylistsLocation(), FileName, translatedPath); else if (RootDir.Equals("videoplaylists")) CUtil::AddFileToFolder(CUtil::VideoPlaylistsLocation(), FileName, translatedPath); - else if (RootDir.Equals("cdrips")) - CUtil::AddFileToFolder(g_guiSettings.GetString("cddaripper.path"), FileName, translatedPath); else if (RootDir.Equals("skin")) CUtil::AddFileToFolder(g_graphicsContext.GetMediaDir(), FileName, translatedPath); diff --git a/xbmc/GUIDialogMediaSource.cpp b/xbmc/GUIDialogMediaSource.cpp index 4c9e20783b..b4c5663af9 100644 --- a/xbmc/GUIDialogMediaSource.cpp +++ b/xbmc/GUIDialogMediaSource.cpp @@ -263,15 +263,9 @@ void CGUIDialogMediaSource::OnPathBrowse(int item) share1.strName = "Zeroconf Browser"; extraShares.push_back(share1); - if (g_guiSettings.GetString("mymusic.recordingpath",false) != "") + if (g_guiSettings.GetString("audiocds.recordingpath",false) != "") { share1.strPath = "special://recordings/"; - share1.strName = g_localizeStrings.Get(20007); - extraShares.push_back(share1); - } - if (g_guiSettings.GetString("cddaripper.path",false) != "") - { - share1.strPath = "special://cdrips/"; share1.strName = g_localizeStrings.Get(21883); extraShares.push_back(share1); } diff --git a/xbmc/GUIDialogMusicOSD.cpp b/xbmc/GUIDialogMusicOSD.cpp index 2d17c396a3..1f8bae8ba7 100644 --- a/xbmc/GUIDialogMusicOSD.cpp +++ b/xbmc/GUIDialogMusicOSD.cpp @@ -53,9 +53,9 @@ bool CGUIDialogMusicOSD::OnMessage(CGUIMessage &message) OnMessage(msg); CStdString strLabel = msg.GetLabel(); if (msg.GetParam1() == 0) - g_guiSettings.SetString("mymusic.visualisation", "None"); + g_guiSettings.SetString("musicplayer.visualisation", "None"); else - g_guiSettings.SetString("mymusic.visualisation", + g_guiSettings.SetString("musicplayer.visualisation", CVisualisation::GetCombinedName( strLabel )); // hide the control and reset focus SET_CONTROL_HIDDEN(CONTROL_VIS_CHOOSER); @@ -108,7 +108,7 @@ void CGUIDialogMusicOSD::Render() void CGUIDialogMusicOSD::OnInitWindow() { - CSetting *pSetting = g_guiSettings.GetSetting("mymusic.visualisation"); + CSetting *pSetting = g_guiSettings.GetSetting("musicplayer.visualisation"); CGUIWindowSettingsCategory::FillInVisualisations(pSetting, CONTROL_VIS_CHOOSER); ResetControlStates(); diff --git a/xbmc/GUIDialogVisualisationPresetList.cpp b/xbmc/GUIDialogVisualisationPresetList.cpp index dfbdd5aa28..cbe615e264 100644 --- a/xbmc/GUIDialogVisualisationPresetList.cpp +++ b/xbmc/GUIDialogVisualisationPresetList.cpp @@ -145,7 +145,7 @@ void CGUIDialogVisualisationPresetList::SetVisualisation(CVisualisation *pVisual } } // update our settings label - CStdString strVis = g_guiSettings.GetString("mymusic.visualisation"); + CStdString strVis = g_guiSettings.GetString("musicplayer.visualisation"); if (strVis != "None" && strVis.size() > 4) { // make it look pretty strVis = strVis.Left(strVis.size() - 4); diff --git a/xbmc/GUISettings.cpp b/xbmc/GUISettings.cpp index 9b98b8ce8e..ccc8e82f98 100644 --- a/xbmc/GUISettings.cpp +++ b/xbmc/GUISettings.cpp @@ -242,19 +242,9 @@ void CGUISettings::Initialize() // My Music Settings AddGroup(3, 2); - AddCategory(3, "mymusic", 16000); - - AddString(1, "mymusic.visualisation", 250, DEFAULT_VISUALISATION, SPIN_CONTROL_TEXT); - - AddSeparator(2, "mymusic.sep1"); - AddBool(3, "mymusic.autoplaynextitem", 489, true); - AddBool(4, "mymusic.queuebydefault", 14084, false); - AddSeparator(6, "mymusic.sep2"); - AddPath(7,"mymusic.recordingpath",20005,"select writable folder",BUTTON_CONTROL_PATH_INPUT,false,657); - AddCategory(3,"musiclibrary",14022); AddBool(0, "musiclibrary.enabled", 418, true); - AddBool(2, "musiclibrary.albumartistsonly", 13414, false); + AddBool(2, "musiclibrary.showcompilationartists", 13414, true); AddSeparator(3,"musiclibrary.sep1"); AddBool(4,"musiclibrary.downloadinfo", 20192, false); AddString(6, "musiclibrary.defaultscraper", 20194, "discogs.xml", SPIN_CONTROL_TEXT); @@ -266,19 +256,20 @@ void CGUISettings::Initialize() AddString(11, "musiclibrary.export", 20196, "", BUTTON_CONTROL_STANDARD); AddString(12, "musiclibrary.import", 20197, "", BUTTON_CONTROL_STANDARD); - AddCategory(3, "musicplayer", 16003); + AddCategory(3, "musicplayer", 14086); + AddBool(1, "musicplayer.autoplaynextitem", 489, true); + AddBool(2, "musicplayer.queuebydefault", 14084, false); AddSeparator(3, "musicplayer.sep1"); AddInt(4, "musicplayer.replaygaintype", 638, REPLAY_GAIN_ALBUM, REPLAY_GAIN_NONE, 1, REPLAY_GAIN_TRACK, SPIN_CONTROL_TEXT); AddInt(0, "musicplayer.replaygainpreamp", 641, 89, 77, 1, 101, SPIN_CONTROL_INT_PLUS, MASK_DB); AddInt(0, "musicplayer.replaygainnogainpreamp", 642, 89, 77, 1, 101, SPIN_CONTROL_INT_PLUS, MASK_DB); AddBool(0, "musicplayer.replaygainavoidclipping", 643, false); - AddSeparator(8, "musicplayer.sep2"); - AddInt(9, "musicplayer.crossfade", 13314, 0, 0, 1, 15, SPIN_CONTROL_INT_PLUS, MASK_SECS, TEXT_OFF); - AddBool(10, "musicplayer.crossfadealbumtracks", 13400, true); - AddSeparator(11, "musicplayer.sep3"); - AddString(0, "musicplayer.jumptocache", 439, "", BUTTON_CONTROL_STANDARD); + AddInt(5, "musicplayer.crossfade", 13314, 0, 0, 1, 15, SPIN_CONTROL_INT_PLUS, MASK_SECS, TEXT_OFF); + AddBool(6, "musicplayer.crossfadealbumtracks", 13400, true); + AddSeparator(7, "musicplayer.sep3"); + AddString(8, "musicplayer.visualisation", 250, DEFAULT_VISUALISATION, SPIN_CONTROL_TEXT); - AddCategory(3, "musicfiles", 744); + AddCategory(3, "musicfiles", 14081); AddBool(1, "musicfiles.usetags", 258, true); AddString(2, "musicfiles.trackformat", 13307, "[%N. ]%A - %T", EDIT_CONTROL_INPUT, false, 16016); AddString(3, "musicfiles.trackformatright", 13387, "%D", EDIT_CONTROL_INPUT, false, 16016); @@ -287,9 +278,7 @@ void CGUISettings::Initialize() AddString(0, "musicfiles.nowplayingtrackformatright", 13387, "", EDIT_CONTROL_INPUT, false, 16016); AddString(0, "musicfiles.librarytrackformat", 13307, "", EDIT_CONTROL_INPUT, false, 16016); AddString(0, "musicfiles.librarytrackformatright", 13387, "", EDIT_CONTROL_INPUT, false, 16016); - AddSeparator(4, "musicfiles.sep1"); - AddBool(10, "musicfiles.usecddb", 227, true); - AddBool(11, "musicfiles.findremotethumbs", 14059, true); + AddBool(4, "musicfiles.findremotethumbs", 14059, true); AddCategory(3, "scrobbler", 15221); AddBool(1, "scrobbler.lastfmsubmit", 15201, false); @@ -301,12 +290,15 @@ void CGUISettings::Initialize() AddString(7, "scrobbler.librefmusername", 15218, "", EDIT_CONTROL_INPUT, false, 15218); AddString(8, "scrobbler.librefmpassword", 15219, "", EDIT_CONTROL_HIDDEN_INPUT, false, 15219); - AddCategory(3, "cddaripper", 620); - AddPath(1, "cddaripper.path", 20000, "select writable folder", BUTTON_CONTROL_PATH_INPUT, false, 657); - AddString(2, "cddaripper.trackformat", 13307, "[%N. ]%T - %A", EDIT_CONTROL_INPUT, false, 16016); - AddInt(3, "cddaripper.encoder", 621, CDDARIP_ENCODER_LAME, CDDARIP_ENCODER_LAME, 1, CDDARIP_ENCODER_WAV, SPIN_CONTROL_TEXT); - AddInt(4, "cddaripper.quality", 622, CDDARIP_QUALITY_CBR, CDDARIP_QUALITY_CBR, 1, CDDARIP_QUALITY_EXTREME, SPIN_CONTROL_TEXT); - AddInt(5, "cddaripper.bitrate", 623, 192, 128, 32, 320, SPIN_CONTROL_INT_PLUS, MASK_KBPS); + AddCategory(3, "audiocds", 620); + AddBool(1, "audiocds.autorun", 14085, false); + AddBool(2, "audiocds.usecddb", 227, true); + AddSeparator(3, "audiocds.sep1"); + AddPath(4,"audiocds.recordingpath",20000,"select writable folder",BUTTON_CONTROL_PATH_INPUT,false,657); + AddString(5, "audiocds.trackformat", 13307, "[%N. ]%T - %A", EDIT_CONTROL_INPUT, false, 16016); + AddInt(6, "audiocds.encoder", 621, CDDARIP_ENCODER_LAME, CDDARIP_ENCODER_LAME, 1, CDDARIP_ENCODER_WAV, SPIN_CONTROL_TEXT); + AddInt(7, "audiocds.quality", 622, CDDARIP_QUALITY_CBR, CDDARIP_QUALITY_CBR, 1, CDDARIP_QUALITY_EXTREME, SPIN_CONTROL_TEXT); + AddInt(8, "audiocds.bitrate", 623, 192, 128, 32, 320, SPIN_CONTROL_INT_PLUS, MASK_KBPS); #ifdef HAS_KARAOKE AddCategory(3, "karaoke", 13327); @@ -1001,8 +993,8 @@ void CGUISettings::LoadXML(TiXmlElement *pRootElement, bool hideSettings /* = fa m_replayGain.bAvoidClipping = GetBool("musicplayer.replaygainavoidclipping"); // check if we load the right vis - if(!CVisualisation::IsValidVisualisation(g_guiSettings.GetString("mymusic.visualisation"))) - g_guiSettings.SetString("mymusic.visualisation", DEFAULT_VISUALISATION); + if(!CVisualisation::IsValidVisualisation(g_guiSettings.GetString("musicplayer.visualisation"))) + g_guiSettings.SetString("musicplayer.visualisation", DEFAULT_VISUALISATION); #if defined(_LINUX) && !defined(__APPLE__) CStdString timezone = GetString("locale.timezone"); diff --git a/xbmc/GUIViewStateMusic.cpp b/xbmc/GUIViewStateMusic.cpp index 5a4842b880..5e1d690546 100644 --- a/xbmc/GUIViewStateMusic.cpp +++ b/xbmc/GUIViewStateMusic.cpp @@ -48,8 +48,8 @@ int CGUIViewStateWindowMusic::GetPlaylist() bool CGUIViewStateWindowMusic::AutoPlayNextItem() { - return g_guiSettings.GetBool("mymusic.autoplaynextitem") && - !g_guiSettings.GetBool("mymusic.queuebydefault"); + return g_guiSettings.GetBool("musicplayer.autoplaynextitem") && + !g_guiSettings.GetBool("musicplayer.queuebydefault"); } CStdString CGUIViewStateWindowMusic::GetLockType() diff --git a/xbmc/GUIViewStateVideo.cpp b/xbmc/GUIViewStateVideo.cpp index af62289f50..4c0800829b 100644 --- a/xbmc/GUIViewStateVideo.cpp +++ b/xbmc/GUIViewStateVideo.cpp @@ -415,7 +415,7 @@ bool CGUIViewStateWindowVideoNav::AutoPlayNextItem() CQueryParams params; CVideoDatabaseDirectory::GetQueryParams(m_items.m_strPath,params); if (params.GetContentType() == VIDEODB_CONTENT_MUSICVIDEOS || params.GetContentType() == 6) // recently added musicvideos - return g_guiSettings.GetBool("mymusic.autoplaynextitem"); + return g_guiSettings.GetBool("musicplayer.autoplaynextitem"); return false; } diff --git a/xbmc/GUIWindowMusicBase.cpp b/xbmc/GUIWindowMusicBase.cpp index 6d6ee175e8..96e4fad6a7 100644 --- a/xbmc/GUIWindowMusicBase.cpp +++ b/xbmc/GUIWindowMusicBase.cpp @@ -1209,7 +1209,7 @@ bool CGUIWindowMusicBase::OnPlayMedia(int iItem) { // single music file - if we get here then we have autoplaynextitem turned off or queuebydefault // turned on, but we still want to use the playlist player in order to handle more queued items // following etc. - if (g_guiSettings.GetBool("mymusic.queuebydefault") && g_windowManager.GetActiveWindow() != WINDOW_MUSIC_PLAYLIST_EDITOR) + if (g_guiSettings.GetBool("musicplayer.queuebydefault") && g_windowManager.GetActiveWindow() != WINDOW_MUSIC_PLAYLIST_EDITOR) { // TODO: Should the playlist be cleared if nothing is already playing? OnQueueItem(iItem); diff --git a/xbmc/GUIWindowSettingsCategory.cpp b/xbmc/GUIWindowSettingsCategory.cpp index da4724b3ef..629d79c118 100644 --- a/xbmc/GUIWindowSettingsCategory.cpp +++ b/xbmc/GUIWindowSettingsCategory.cpp @@ -443,7 +443,7 @@ void CGUIWindowSettingsCategory::CreateSettings() } pControl->SetValue(pSettingInt->GetData()); } - else if (strSetting.Equals("mymusic.visualisation")) + else if (strSetting.Equals("musicplayer.visualisation")) { FillInVisualisations(pSetting, GetSetting(pSetting->GetSetting())->GetID()); } @@ -501,7 +501,7 @@ void CGUIWindowSettingsCategory::CreateSettings() pControl->AddLabel(g_localizeStrings.Get(21377), VIDEO_WIDESCREEN); pControl->SetValue(pSettingInt->GetData()); } - else if (strSetting.Equals("cddaripper.encoder")) + else if (strSetting.Equals("audiocds.encoder")) { CSettingInt *pSettingInt = (CSettingInt*)pSetting; CGUISpinControlEx *pControl = (CGUISpinControlEx *)GetControl(GetSetting(strSetting)->GetID()); @@ -510,7 +510,7 @@ void CGUIWindowSettingsCategory::CreateSettings() pControl->AddLabel("Wav", CDDARIP_ENCODER_WAV); pControl->SetValue(pSettingInt->GetData()); } - else if (strSetting.Equals("cddaripper.quality")) + else if (strSetting.Equals("audiocds.quality")) { CSettingInt *pSettingInt = (CSettingInt*)pSetting; CGUISpinControlEx *pControl = (CGUISpinControlEx *)GetControl(GetSetting(strSetting)->GetID()); @@ -1042,16 +1042,16 @@ void CGUIWindowSettingsCategory::UpdateSettings() CGUIControl *pControl = (CGUIControl *)GetControl(pSettingControl->GetID()); if (pControl) pControl->SetEnabled(g_guiSettings.GetBool("services.esenabled")); } - else if (strSetting.Equals("cddaripper.quality")) + else if (strSetting.Equals("audiocds.quality")) { // only visible if we are doing non-WAV ripping CGUIControl *pControl = (CGUIControl *)GetControl(pSettingControl->GetID()); - if (pControl) pControl->SetEnabled(g_guiSettings.GetInt("cddaripper.encoder") != CDDARIP_ENCODER_WAV); + if (pControl) pControl->SetEnabled(g_guiSettings.GetInt("audiocds.encoder") != CDDARIP_ENCODER_WAV); } - else if (strSetting.Equals("cddaripper.bitrate")) + else if (strSetting.Equals("audiocds.bitrate")) { // only visible if we are ripping to CBR CGUIControl *pControl = (CGUIControl *)GetControl(pSettingControl->GetID()); - if (pControl) pControl->SetEnabled((g_guiSettings.GetInt("cddaripper.encoder") != CDDARIP_ENCODER_WAV) && - (g_guiSettings.GetInt("cddaripper.quality") == CDDARIP_QUALITY_CBR)); + if (pControl) pControl->SetEnabled((g_guiSettings.GetInt("audiocds.encoder") != CDDARIP_ENCODER_WAV) && + (g_guiSettings.GetInt("audiocds.quality") == CDDARIP_QUALITY_CBR)); } else if (strSetting.Equals("audiooutput.ac3passthrough") || strSetting.Equals("audiooutput.dtspassthrough") || strSetting.Equals("audiooutput.passthroughdevice")) { // only visible if we are in digital mode @@ -1291,7 +1291,7 @@ void CGUIWindowSettingsCategory::UpdateSettings() CGUIControl *pControl = (CGUIControl *)GetControl(pSettingControl->GetID()); if (pControl) pControl->SetEnabled(g_guiSettings.GetBool("videoplayer.useexternaldvdplayer")); } - else if (strSetting.Equals("cddaripper.path") || strSetting.Equals("mymusic.recordingpath") || strSetting.Equals("system.screenshotpath")) + else if (strSetting.Equals("audiocds.recordingpath") || strSetting.Equals("system.screenshotpath")) { CGUIButtonControl *pControl = (CGUIButtonControl *)GetControl(pSettingControl->GetID()); if (pControl && g_guiSettings.GetString(strSetting, false).IsEmpty()) @@ -1452,7 +1452,7 @@ void CGUIWindowSettingsCategory::OnSettingChanged(CBaseSettingControl *pSettingC CStdString strSetting = pSettingControl->GetSetting()->GetSetting(); // ok, now check the various special things we need to do - if (strSetting.Equals("mymusic.visualisation")) + if (strSetting.Equals("musicplayer.visualisation")) { // new visualisation choosen... CSettingString *pSettingString = (CSettingString *)pSettingControl->GetSetting(); CGUISpinControlEx *pControl = (CGUISpinControlEx *)GetControl(pSettingControl->GetID()); @@ -1663,7 +1663,7 @@ void CGUIWindowSettingsCategory::OnSettingChanged(CBaseSettingControl *pSettingC musicdatabase.Close(); } } - else if (strSetting.Equals("musicplayer.jumptocache") || strSetting.Equals("videoplayer.jumptocache")) + else if (strSetting.Equals("videoplayer.jumptocache")) { JumpToSection(WINDOW_SETTINGS_SYSTEM, "cache"); } @@ -2074,7 +2074,7 @@ void CGUIWindowSettingsCategory::OnSettingChanged(CBaseSettingControl *pSettingC if (CGUIDialogFileBrowser::ShowAndGetDirectory(g_settings.m_pictureSources, g_localizeStrings.Get(pSettingString->m_iHeadingString), path)) pSettingString->SetData(path); } - else if (strSetting.Equals("system.screenshotpath") || strSetting.Equals("mymusic.recordingpath") || strSetting.Equals("cddaripper.path") || strSetting.Equals("subtitles.custompath")) + else if (strSetting.Equals("system.screenshotpath") || strSetting.Equals("audiocds.recordingpath") || strSetting.Equals("subtitles.custompath")) { CSettingString *pSettingString = (CSettingString *)pSettingControl->GetSetting(); CStdString path = g_guiSettings.GetString(strSetting,false); diff --git a/xbmc/GUIWindowVideoBase.cpp b/xbmc/GUIWindowVideoBase.cpp index a034685cf5..04e6371713 100644 --- a/xbmc/GUIWindowVideoBase.cpp +++ b/xbmc/GUIWindowVideoBase.cpp @@ -1447,8 +1447,9 @@ void CGUIWindowVideoBase::MarkWatched(const CFileItemPtr &item, bool mark) CFileItemPtr pItem=items[i]; if (pItem->IsVideoDb()) { - if ((pItem->HasVideoInfoTag() && - pItem->GetVideoInfoTag()->m_playCount == mark?1:0)) + if (pItem->HasVideoInfoTag() && + (( mark && pItem->GetVideoInfoTag()->m_playCount) || + (!mark && pItem->GetVideoInfoTag()->m_playCount > 0))) continue; } diff --git a/xbmc/MediaManager.cpp b/xbmc/MediaManager.cpp index 13274df1d2..afc1495872 100644 --- a/xbmc/MediaManager.cpp +++ b/xbmc/MediaManager.cpp @@ -462,7 +462,7 @@ std::vector CMediaManager::GetDiskUsage() void CMediaManager::OnStorageAdded(const CStdString &label, const CStdString &path) { - if (g_guiSettings.GetBool("lookandfeel.autorun")) + if (g_guiSettings.GetBool("audiocds.autorun") || g_guiSettings.GetBool("lookandfeel.autorun")) CJobManager::GetInstance().AddJob(new CAutorunMediaJob(label, path), this, CJob::PRIORITY_HIGH); else g_application.m_guiDialogKaiToast.QueueNotification(g_localizeStrings.Get(13021), label); diff --git a/xbmc/MusicDatabase.cpp b/xbmc/MusicDatabase.cpp index 878f8e96ef..db0d3ec994 100644 --- a/xbmc/MusicDatabase.cpp +++ b/xbmc/MusicDatabase.cpp @@ -2252,7 +2252,7 @@ void CMusicDatabase::DeleteAlbumInfo() bool CMusicDatabase::LookupCDDBInfo(bool bRequery/*=false*/) { #ifdef HAS_DVD_DRIVE - if (!g_guiSettings.GetBool("musicfiles.usecddb")) + if (!g_guiSettings.GetBool("audiocds.usecddb")) return false; // check network connectivity diff --git a/xbmc/cdrip/CDDARipper.cpp b/xbmc/cdrip/CDDARipper.cpp index 314b1870c0..7e0e13eee2 100644 --- a/xbmc/cdrip/CDDARipper.cpp +++ b/xbmc/cdrip/CDDARipper.cpp @@ -64,7 +64,7 @@ bool CCDDARipper::Init(const CStdString& strTrackFile, const CStdString& strFile { m_cdReader.Init(strTrackFile); - switch (g_guiSettings.GetInt("cddaripper.encoder")) + switch (g_guiSettings.GetInt("audiocds.encoder")) { case CDDARIP_ENCODER_WAV: m_pEncoder = new CEncoderWav(); @@ -247,7 +247,7 @@ bool CCDDARipper::Rip(const CStdString& strTrackFile, const CStdString& strFile, // rip a single track from cd bool CCDDARipper::RipTrack(CFileItem* pItem) { - CStdString strDirectory = g_guiSettings.GetString("cddaripper.path"); + CStdString strDirectory = g_guiSettings.GetString("audiocds.recordingpath"); CUtil::AddSlashAtEnd(strDirectory); CFileItem ripPath(strDirectory, true); @@ -291,7 +291,7 @@ bool CCDDARipper::RipCD() int iTrack = 0; bool bResult = true; CStdString strFile; - CStdString strDirectory = g_guiSettings.GetString("cddaripper.path"); + CStdString strDirectory = g_guiSettings.GetString("audiocds.recordingpath"); CUtil::AddSlashAtEnd(strDirectory); CFileItem ripPath(strDirectory, true); bool bIsFATX = !ripPath.IsSmb(); @@ -423,14 +423,14 @@ CStdString CCDDARipper::GetTrackName(CFileItem *item, int LegalType) // Format up our ripped file label CFileItem destItem(*item); destItem.SetLabel(""); - CLabelFormatter formatter(g_guiSettings.GetString("cddaripper.trackformat"), ""); + CLabelFormatter formatter(g_guiSettings.GetString("audiocds.trackformat"), ""); formatter.FormatLabel(&destItem); // grab the label to use it as our ripped filename CStdString track = destItem.GetLabel(); if (track.IsEmpty()) track.Format("%s%02i", "Track-", trackNumber); - track += GetExtension(g_guiSettings.GetInt("cddaripper.encoder")); + track += GetExtension(g_guiSettings.GetInt("audiocds.encoder")); // make sure the filename is legal track = CUtil::MakeLegalFileName(track, LegalType); diff --git a/xbmc/cdrip/EncoderLame.cpp b/xbmc/cdrip/EncoderLame.cpp index 8b96277024..281d54e434 100644 --- a/xbmc/cdrip/EncoderLame.cpp +++ b/xbmc/cdrip/EncoderLame.cpp @@ -58,9 +58,9 @@ bool CEncoderLame::Init(const char* strFile, int iInChannels, int iInRate, int i } // setup parmaters, see lame.h for possibilities - if (g_guiSettings.GetInt("cddaripper.quality") == CDDARIP_QUALITY_CBR) + if (g_guiSettings.GetInt("audiocds.quality") == CDDARIP_QUALITY_CBR) { - int bitrate = g_guiSettings.GetInt("cddaripper.bitrate"); + int bitrate = g_guiSettings.GetInt("audiocds.bitrate"); // use cbr and specified bitrate from settings CLog::Log(LOGDEBUG, "Lame setting CBR bitrate %d", bitrate); m_dll.lame_set_brate(m_pGlobalFlags, bitrate); @@ -70,7 +70,7 @@ bool CEncoderLame::Init(const char* strFile, int iInChannels, int iInRate, int i // use presets (VBR) CStdString strSettings; int preset; - switch (g_guiSettings.GetInt("cddaripper.quality")) + switch (g_guiSettings.GetInt("audiocds.quality")) { case CDDARIP_QUALITY_MEDIUM: preset = MEDIUM; diff --git a/xbmc/cdrip/EncoderVorbis.cpp b/xbmc/cdrip/EncoderVorbis.cpp index 101a888561..aa73bded46 100644 --- a/xbmc/cdrip/EncoderVorbis.cpp +++ b/xbmc/cdrip/EncoderVorbis.cpp @@ -37,9 +37,9 @@ bool CEncoderVorbis::Init(const char* strFile, int iInChannels, int iInRate, int if (!CEncoder::Init(strFile, iInChannels, iInRate, iInBits)) return false; float fQuality = 0.5f; - if (g_guiSettings.GetInt("cddaripper.quality") == CDDARIP_QUALITY_MEDIUM) fQuality = 0.4f; - if (g_guiSettings.GetInt("cddaripper.quality") == CDDARIP_QUALITY_STANDARD) fQuality = 0.5f; - if (g_guiSettings.GetInt("cddaripper.quality") == CDDARIP_QUALITY_EXTREME) fQuality = 0.7f; + if (g_guiSettings.GetInt("audiocds.quality") == CDDARIP_QUALITY_MEDIUM) fQuality = 0.4f; + if (g_guiSettings.GetInt("audiocds.quality") == CDDARIP_QUALITY_STANDARD) fQuality = 0.5f; + if (g_guiSettings.GetInt("audiocds.quality") == CDDARIP_QUALITY_EXTREME) fQuality = 0.7f; if (!m_VorbisEncDll.Load() || !m_OggDll.Load() || !m_VorbisDll.Load()) { @@ -49,10 +49,10 @@ bool CEncoderVorbis::Init(const char* strFile, int iInChannels, int iInRate, int } m_VorbisDll.vorbis_info_init(&m_sVorbisInfo); - if (g_guiSettings.GetInt("cddaripper.quality") == CDDARIP_QUALITY_CBR) + if (g_guiSettings.GetInt("audiocds.quality") == CDDARIP_QUALITY_CBR) { // not realy cbr, but abr in this case - int iBitRate = g_guiSettings.GetInt("cddaripper.bitrate") * 1000; + int iBitRate = g_guiSettings.GetInt("audiocds.bitrate") * 1000; m_VorbisEncDll.vorbis_encode_init(&m_sVorbisInfo, m_iInChannels, m_iInSampleRate, -1, iBitRate, -1); } else diff --git a/xbmc/utils/GUIInfoManager.cpp b/xbmc/utils/GUIInfoManager.cpp index 1de2efe2bc..bec9b4e78c 100644 --- a/xbmc/utils/GUIInfoManager.cpp +++ b/xbmc/utils/GUIInfoManager.cpp @@ -1485,7 +1485,7 @@ CStdString CGUIInfoManager::GetLabel(int info, int contextWindow) break; case VISUALISATION_NAME: { - strLabel = g_guiSettings.GetString("mymusic.visualisation"); + strLabel = g_guiSettings.GetString("musicplayer.visualisation"); if (strLabel != "None" && strLabel.size() > 4) { // make it look pretty strLabel = strLabel.Left(strLabel.size() - 4); @@ -1968,7 +1968,7 @@ bool CGUIInfoManager::GetBool(int condition1, int contextWindow, const CGUIListI } break; case VISUALISATION_ENABLED: - bReturn = g_guiSettings.GetString("mymusic.visualisation") != "None"; + bReturn = g_guiSettings.GetString("musicplayer.visualisation") != "None"; break; default: // default, use integer value different from 0 as true bReturn = GetInt(condition) != 0; -- cgit v1.2.3