Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

cleanup: removed more Xbox Media Center, XboxMediaPlayer, faulty

webaddresser and numerous other typos
fixed: backward compability in UPnPDirectory.cpp (thanks to d4rk)


git-svn-id: https://xbmc.svn.sourceforge.net/svnroot/xbmc/branches/linuxport/XBMC@15201 568bbfeb-2a22-0410-94d2-cc84cf5bfa90
  • Loading branch information...
commit b8c7cbd3b72bbc81776d650474ebd016f5a6c663 1 parent 4ca0a37
blittan authored
Showing with 111 additions and 150 deletions.
  1. +1 −1  XBMC.kdevelop
  2. +1 −1  guilib/Tween.h
  3. +1 −1  language/Czech/strings.xml
  4. +1 −1  language/Esperanto/strings.xml
  5. +1 −1  language/German/keyboardmap.xml
  6. +1 −1  language/German/strings.xml
  7. +1 −1  language/Hebrew/strings.xml
  8. +1 −1  language/Indonesian/strings.xml
  9. +2 −2 language/Japanese/strings.xml
  10. +2 −2 language/Korean/strings.xml
  11. +1 −1  language/Portuguese (Brazil)/strings.xml
  12. +1 −1  language/Portuguese/strings.xml
  13. +2 −2 language/Romanian/strings.xml
  14. +2 −2 language/Russian/strings.xml
  15. +1 −1  language/Slovenian/strings.xml
  16. +1 −1  language/Turkish/strings.xml
  17. +2 −2 language/Ukrainian/strings.xml
  18. +0 −7 skin/Project Mayhem III/sounds/sounds.xml
  19. +0 −7 sounds/Bursting Bubbles/sounds.xml
  20. +1 −1  tools/EventClients/Clients/J2ME Client/j2me_remote.py
  21. +1 −1  tools/EventClients/Clients/J2ME Client/src/BluetoothCommunicator.java
  22. +1 −1  tools/EventClients/Clients/J2ME Client/src/BluetoothEvent.java
  23. +1 −1  tools/EventClients/Clients/J2ME Client/src/BluetoothServiceDiscovery.java
  24. +1 −1  tools/EventClients/Clients/J2ME Client/src/KeyCanvas.java
  25. +1 −1  tools/EventClients/Clients/J2ME Client/src/KeyHandler.java
  26. +1 −1  tools/EventClients/Clients/J2ME Client/src/MainScreen.java
  27. +2 −2 tools/Translator/Changelog.txt
  28. +2 −2 tools/Translator/Setup/Setup.vdproj
  29. +1 −1  tools/Translator/Translator/AboutForm.cs
  30. +1 −1  tools/Translator/Translator/MainForm.cs
  31. +1 −1  xbmc/Application.cpp
  32. +1 −1  xbmc/Application.h
  33. +1 −1  xbmc/Crc32.h
  34. +1 −1  xbmc/FileSystem/File.cpp
  35. +1 −1  xbmc/FileSystem/File.h
  36. +1 −1  xbmc/FileSystem/FileFileReader.cpp
  37. +1 −1  xbmc/FileSystem/FileFileReader.h
  38. +1 −1  xbmc/FileSystem/FileHD.cpp
  39. +1 −1  xbmc/FileSystem/FileHD.h
  40. +1 −1  xbmc/FileSystem/FileISO.cpp
  41. +1 −1  xbmc/FileSystem/FileISO.h
  42. +1 −1  xbmc/FileSystem/FileXBMSP.cpp
  43. +1 −1  xbmc/FileSystem/FileXBMSP.h
  44. +1 −1  xbmc/FileSystem/IFile.cpp
  45. +1 −1  xbmc/FileSystem/IFile.h
  46. +1 −1  xbmc/FileSystem/UPnPDirectory.cpp
  47. +1 −22 xbmc/Profile.cpp
  48. +1 −1  xbmc/Settings.h
  49. +1 −1  xbmc/cores/VideoRenderers/LinuxRendererATI.cpp
  50. +1 −1  xbmc/cores/VideoRenderers/LinuxRendererGL.cpp
  51. +1 −1  xbmc/cores/VideoRenderers/VideoShaders/VideoFilterShader.cpp
  52. +1 −1  xbmc/cores/VideoRenderers/VideoShaders/YUV2RGBShader.cpp
  53. +1 −1  xbmc/cores/dvdplayer/ALSADirectSound.cpp
  54. +1 −1  xbmc/cores/dvdplayer/ALSADirectSound.h
  55. +1 −1  xbmc/cores/dvdplayer/PortaudioDirectSound.cpp
  56. +1 −1  xbmc/cores/dvdplayer/PortaudioDirectSound.h
  57. +1 −1  xbmc/cores/mplayer/IDirectSoundRenderer.h
  58. +1 −1  xbmc/cores/mplayer/Win32DirectSound.cpp
  59. +1 −1  xbmc/cores/mplayer/Win32DirectSound.h
  60. +1 −1  xbmc/cores/paplayer/MP3Codec/MADCodec/MadMp3Decoder.cpp
  61. +1 −1  xbmc/doxygen.hpp
  62. +1 −1  xbmc/lib/cximage-6.0/zlib/config.log
  63. +23 −27 xbmc/lib/libGoAhead/XBMCConfiguration.cpp
  64. +2 −2 xbmc/lib/libPython/xbmcmodule/control.cpp
  65. +1 −1  xbmc/lib/libPython/xbmcmodule/pyutil.h
  66. +1 −1  xbmc/lib/libexif/ExifParse.cpp
  67. +1 −1  xbmc/lib/libexif/IptcParse.cpp
  68. +1 −1  xbmc/lib/libexif/JpegParse.cpp
  69. +1 −1  xbmc/linux/XCriticalSection.cpp
  70. +1 −1  xbmc/utils/CriticalSection.cpp
  71. +1 −1  xbmc/utils/Event.cpp
  72. +1 −1  xbmc/utils/Event.h
  73. +1 −1  xbmc/utils/SingleLock.cpp
  74. +1 −1  xbmc/utils/SingleLock.h
  75. +1 −1  xbmc/utils/Thread.cpp
  76. +1 −1  xbmc/utils/UdpClient.h
  77. +1 −1  xbmc/visualizations/XBMCProjectM/Main.cpp
  78. +3 −3 xbmc/win32/XBMC_PC.cpp
  79. +1 −1  xbmc/win32/XCriticalSection.cpp
  80. +1 −1  xbmc/xbox/IoSupport.cpp
  81. +1 −1  xbmc/xbox/IoSupport.h
View
2  XBMC.kdevelop
@@ -16,7 +16,7 @@
</general>
<kdevcustomproject>
<run>
- <mainprogram>/home/jcmarsha/XBMC/XboxMediaCenter</mainprogram>
+ <mainprogram>/home/jcmarsha/XBMC/XBMCMediaCenter</mainprogram>
<directoryradio>executable</directoryradio>
<programargs></programargs>
<globaldebugarguments></globaldebugarguments>
View
2  guilib/Tween.h
@@ -27,7 +27,7 @@
// A couple of tweening classes implemented in C++.
// ref: http://www.robertpenner.com/easing/
//
-// Author: d4rk <d4rk@xboxmediacenter.com>
+// Author: d4rk <d4rk@xbmc.org>
///////////////////////////////////////////////////////////////////////
View
2  language/Czech/strings.xml
@@ -518,7 +518,7 @@
<string id="606">Číslo stopy:</string>
<string id="607">Do:</string>
<string id="608">Stopu nebo CD nelze zkopírovat</string>
-<string id="609">V XboxMediaCenter.xml není nastavena složka pro ukládání kopií CD.</string>
+<string id="609">V sources.xml není nastavena složka pro ukládání kopií CD.</string>
<string id="610">Zkopírovat audiostopu</string>
<string id="620">Kopírování CD</string>
View
2  language/Esperanto/strings.xml
@@ -470,7 +470,7 @@
<string id="606">Track Number:</string>
<string id="607">To:</string>
<string id="608">Could not rip CD or Track</string>
- <string id="609">CDDARipPath is not set in XboxMediaCtajpi.xml</string>
+ <string id="609">CDDARipPath is not set in sources.xml</string>
<string id="620">CD Ripping</string>
<string id="621">Encoder</string>
<string id="622">Quality</string>
View
2  language/German/keyboardmap.xml
@@ -37,7 +37,7 @@
For details of keyboard layouts see: http://en.wikipedia.org/wiki/Keyboard_layout (thx Gamester17 for this link)
- For details of further development see: http://www.xboxmediacenter.com/forum/showthread.php?t=26796
+ For details of further development see: http://xbmc.org/forum/showthread.php?t=26796
-->
<keyboard_layout>
<!-- following topics are independent of all plattforms and the "last" chance in the processing chain -->
View
2  language/German/strings.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<!--Language file translated with Team XBMC Translator-->
<!--Translator: Bobbin007 / sCAPe / Deezle / StompSC / Bootsy-->
-<!--Email: scape@xboxmediacenter.com-->
+<!--Email: scape@xbmc.org-->
<!--Date of translation: 11/12/2007-->
<!--$Revision$-->
<!--Based on english strings version 10705-->
View
2  language/Hebrew/strings.xml
@@ -509,7 +509,7 @@
<string id="606">מספר רצועה:</string>
<string id="607">אל:</string>
<string id="608">לא יכול להעתיק דיסק או רצועה</string>
- <string id="609">XboxMediaCenter.xml אינו מוגדר ב CDDARipPath</string>
+ <string id="609">sources.xml אינו מוגדר ב CDDARipPath</string>
<string id="610">העתק רצועת דיסק</string>
<string id="611">הכנס מספר</string>
<string id="620">העתקת דיסק</string>
View
2  language/Indonesian/strings.xml
@@ -454,7 +454,7 @@
<string id="606">Nomor Trek:</string>
<string id="607">Ke</string>
<string id="608">Tidak dapat menyalin CD or Trek</string>
- <string id="609">CDDARipPath tidak diatur di XboxMediaCenter.xml</string>
+ <string id="609">CDDARipPath tidak diatur di sources.xml</string>
<string id="620">Ripping CD</string>
<string id="621">Enkoder</string>
<string id="622">Kualitas</string>
View
4 language/Japanese/strings.xml
@@ -441,7 +441,7 @@
<string id="606">Track Number:</string>
<string id="607">To:</string>
<string id="608">Could not rip CD or Track</string>
- <string id="609">CDDARipPath is not set in XboxMediaCenter.xml</string>
+ <string id="609">CDDARipPath is not set in sources.xml</string>
<string id="620">CD Ripping</string>
<string id="621">Encoder</string>
<string id="622">Quality</string>
@@ -504,4 +504,4 @@
<string id="13003">- Delay</string>
<string id="13004">- Minimum file duration</string>
<string id="13100">Flicker filter</string>
-</strings>
+</strings>
View
4 language/Korean/strings.xml
@@ -458,7 +458,7 @@
<string id="606">트랙 번호:</string>
<string id="607">대상:</string>
<string id="608">시디나 트랙을 추출 할수 없습니다</string>
- <string id="609">XboxMediaCenter.xml에 CDDARipPath가 설정되지 않았습니다</string>
+ <string id="609">sources.xml에 CDDARipPath가 설정되지 않았습니다</string>
<string id="620">시디 추출</string>
<string id="621">인코더</string>
<string id="622">음질</string>
@@ -1174,4 +1174,4 @@
<string id="16108">NTSC-J 사용</string>
<string id="16109">PAL-60 사용</string>
<string id="16110">60hz 게임</string>
-</strings>
+</strings>
View
2  language/Portuguese (Brazil)/strings.xml
@@ -512,7 +512,7 @@
<string id="606">Número da faixa:</string>
<string id="607">Para:</string>
<string id="608">Não foi possível extrair o CD ou faixa</string>
- <string id="609">CDDARipPath não foi definido no XboxMediaCenter.xml</string>
+ <string id="609">CDDARipPath não foi definido no sources.xml</string>
<string id="610">Extrair faixa de áudio</string>
<string id="620">Extraindo CD</string>
View
2  language/Portuguese/strings.xml
@@ -503,7 +503,7 @@
<string id="606">Faixa Número:</string>
<string id="607">Para:</string>
<string id="608">Nao foi possível Gravar o CD ou Faixa</string>
- <string id="609">CDDARipPath não está definido no XboxMediaCenter.xml</string>
+ <string id="609">CDDARipPath não está definido no sources.xml</string>
<string id="610">Rip Faixa de Áudio</string>
<string id="620">Gravação de áudio</string>
<string id="621">Codificação</string>
View
4 language/Romanian/strings.xml
@@ -445,7 +445,7 @@
<string id="606">Pista numarul:</string>
<string id="607">La:</string>
<string id="608">Nu se poate copia CD sau Pista</string>
- <string id="609">CDDARipPath nu este setat in XboxMediaCenter.xml</string>
+ <string id="609">CDDARipPath nu este setat in sources.xml</string>
<string id="620">Copiere CD</string>
<string id="621">Encoder</string>
<string id="622">Calitate</string>
@@ -661,4 +661,4 @@
<string id="14040">setarile de retea. Doriti restartarea imediata?</string>
<string id="14041">Post Processing</string>
<string id="14042">Adresa IP Engine</string>
-</strings>
+</strings>
View
4 language/Russian/strings.xml
@@ -454,7 +454,7 @@
<string id="606">Номер трека:</string>
<string id="607">В:</string>
<string id="608">Рип CD-диска или трека невозможен</string>
- <string id="609">Не указано значение (CDDARipPath) в XboxMediaCenter.xml</string>
+ <string id="609">Не указано значение (CDDARipPath) в sources.xml</string>
<string id="620">Риппинг CD</string>
<string id="621">Энкодер</string>
<string id="622">Качество</string>
@@ -1408,4 +1408,4 @@
<string id="20312">Пригасить LCD в Паузе</string>
<string id="20313">Включить LCD в Паузе</string>
<string id="29999">Патч для устранения мерцания</string>
-</strings>
+</strings>
View
2  language/Slovenian/strings.xml
@@ -512,7 +512,7 @@
<string id="606">Številka posnetka:</string>
<string id="607">Do:</string>
<string id="608">Ne morem zripati CD-ja ali zapisa</string>
- <string id="609">CDDAR IP pot ni nastavljena v XboxMediaCenter.xml</string>
+ <string id="609">CDDAR IP pot ni nastavljena v sources.xml</string>
<string id="610">Ripaj Audio posnetek</string>
<string id="620">CD Ripanje</string>
View
2  language/Turkish/strings.xml
@@ -475,7 +475,7 @@
<string id="606">Şarkı Numarası:</string>
<string id="607">Nereye:</string>
<string id="608">CD veya şarkı kopyalanamıyor</string>
- <string id="609">XboxMediaCenter.xml dosyasında kopyalanacak yol mevcut değil</string>
+ <string id="609">sources.xml dosyasında kopyalanacak yol mevcut değil</string>
<string id="620">CD Kaydetme</string>
<string id="621">Çevirici Codec</string>
<string id="622">Kalite</string>
View
4 language/Ukrainian/strings.xml
@@ -453,7 +453,7 @@
<string id="606">Номер треку:</string>
<string id="607">У:</string>
<string id="608">Ріп компакт-диска чи треку неможливий</string>
- <string id="609">Не зазначено значення (CDDARipPath) в XboxMediaCenter.xml</string>
+ <string id="609">Не зазначено значення (CDDARipPath) в sources.xml</string>
<string id="620">Риппінг CD</string>
<string id="621">Энкодер</string>
<string id="622">Якість</string>
@@ -1405,4 +1405,4 @@
<string id="20312">Пригасити LCD в Паузі</string>
<string id="20313">Включити LCD в Паузі</string>
<string id="29999">Патч для усунення мерехтіння</string>
-</strings>
+</strings>
View
7 skin/Project Mayhem III/sounds/sounds.xml
@@ -10,10 +10,6 @@
<!-- Where <name> specifies the action to map a sound to and <file> the wav -->
<!-- file to play when the action occurs. -->
-<!-- Valid entries for <name> can be found at -->
-<!-- http://manual.xboxmediacenter.de/wakka.php?wakka=KeyMappingXML&v=6gu -->
-
-
<!-- Also window specific sound can be played -->
<!-- To map a sound to a window, add a block like this to <windows>: -->
@@ -26,9 +22,6 @@
<!-- <activate> and <deactivate> are the events a sound can be mapped to -->
<!-- by setting the file to play. -->
-<!-- Valid entries for <name> can be found at -->
-<!-- http://manual.xboxmediacenter.de/wakka.php?wakka=WindowList&v=13k6 -->
-
<!-- Note: Only wav files are supported -->
<sounds>
View
7 sounds/Bursting Bubbles/sounds.xml
@@ -10,10 +10,6 @@
<!-- Where <name> specifies the action to map a sound to and <file> the wav -->
<!-- file to play when the action occurs. -->
-<!-- Valid entries for <name> can be found at -->
-<!-- http://manual.xboxmediacenter.de/wakka.php?wakka=KeyMappingXML&v=6gu -->
-
-
<!-- Also window specific sound can be played -->
<!-- To map a sound to a window, add a block like this to <windows>: -->
@@ -26,9 +22,6 @@
<!-- <activate> and <deactivate> are the events a sound can be mapped to -->
<!-- by setting the file to play. -->
-<!-- Valid entries for <name> can be found at -->
-<!-- http://manual.xboxmediacenter.de/wakka.php?wakka=WindowList&v=13k6 -->
-
<!-- Note: Only wav files are supported -->
<sounds>
View
2  tools/EventClients/Clients/J2ME Client/j2me_remote.py
@@ -1,6 +1,6 @@
#!/usr/bin/python
#
-# XBoxMediaCenter
+# XBMC Media Center
# J2ME Remote
# Copyright (c) 2008 topfs2
#
View
2  tools/EventClients/Clients/J2ME Client/src/BluetoothCommunicator.java
@@ -1,5 +1,5 @@
/*
-* XBoxMediaCenter
+* XBMC Media Center
* UDP Event Server
* Copyright (c) 2008 topfs2
*
View
2  tools/EventClients/Clients/J2ME Client/src/BluetoothEvent.java
@@ -1,5 +1,5 @@
/*
-* XBoxMediaCenter
+* XBMC Media Center
* UDP Event Server
* Copyright (c) 2008 topfs2
*
View
2  tools/EventClients/Clients/J2ME Client/src/BluetoothServiceDiscovery.java
@@ -1,5 +1,5 @@
/*
-* XBoxMediaCenter
+* XBMC Media Center
* UDP Event Server
* Copyright (c) 2008 topfs2
*
View
2  tools/EventClients/Clients/J2ME Client/src/KeyCanvas.java
@@ -1,5 +1,5 @@
/*
-* XBoxMediaCenter
+* XBMC Media Center
* UDP Event Server
* Copyright (c) 2008 topfs2
*
View
2  tools/EventClients/Clients/J2ME Client/src/KeyHandler.java
@@ -1,5 +1,5 @@
/*
-* XBoxMediaCenter
+* XBMC Media Center
* UDP Event Server
* Copyright (c) 2008 topfs2
*
View
2  tools/EventClients/Clients/J2ME Client/src/MainScreen.java
@@ -1,5 +1,5 @@
/*
-* XBoxMediaCenter
+* XBMC Media Center
* UDP Event Server
* Copyright (c) 2008 topfs2
*
View
4 tools/Translator/Changelog.txt
@@ -8,14 +8,14 @@ added/fixed: (dd-mm-yyyy) (please specify date in CET)
- 24-09-2006 fixed: possible crashes when loading the langinfo.xml
- 17-09-2006 fixed: No new languages could be created
- 17-09-2006 added: user is now asked if he wants to save changes on app exit or when opening a new file
- - 10-09-2006 changed: help url now points to www.xboxmediacenter.com/wiki/index.php?title=XBMC_Translator
+ - 10-09-2006 changed: help url now points to http://xbmc.org/wiki/index.php?title=XBMC_Translator
- 10-09-2006 added: Product information to the assembly
- 10-09-2006 changed: derived TranslatorException from ApplicationException
- 10-09-2006 fixed: corrected some typos
- 28-07-2006 added: new speed units
- 28-07-2006 fixed: tab stop order when editing a string
- 28-07-2006 added: Translator icon to Add/Remove Programs
- - 28-07-2006 added: menu item help that links to http://www.xbmc.xbox-scene.com/wiki/index.php?title=XBMC_Translator
+ - 28-07-2006 added: menu item help that links to http://xbmc.org/wiki/index.php?title=XBMC_Translator
- 07-07-2006 changed: better searching of stings by whole word
- 26-06-2006 changed: input focus is always set to the textbox in the find form
- 24-06-2006 added: better error message for files with duplicate string id's
View
4 tools/Translator/Setup/Setup.vdproj
@@ -191,13 +191,13 @@
"ProductVersion" = "8:1.0.0"
"Manufacturer" = "8:Team XBMC"
"ARPHELPTELEPHONE" = "8:"
- "ARPHELPLINK" = "8:http://www.xboxmediacenter.com"
+ "ARPHELPLINK" = "8:http://xbmc.org"
"Title" = "8:Team XBMC Translator"
"Subject" = "8:"
"ARPCONTACT" = "8:Team XBMC"
"Keywords" = "8:"
"ARPCOMMENTS" = "8:"
- "ARPURLINFOABOUT" = "8:http://www.xboxmediacenter.com"
+ "ARPURLINFOABOUT" = "8:http://xbmc.org"
"ARPPRODUCTICON" = "8:_06A7E233C0184D43976534F6D22D901A"
"ARPIconIndex" = "3:0"
"SearchPath" = "8:"
View
2  tools/Translator/Translator/AboutForm.cs
@@ -104,7 +104,7 @@ private void InitializeComponent()
this.linkLabel1.TabIndex = 3;
this.linkLabel1.TabStop = true;
this.linkLabel1.Tag = "";
- this.linkLabel1.Text = "http://www.xboxmediacenter.com";
+ this.linkLabel1.Text = "http://xbmc.org";
this.linkLabel1.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
this.linkLabel1.UseMnemonic = false;
this.linkLabel1.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.linkLabel1_LinkClicked);
View
2  tools/Translator/Translator/MainForm.cs
@@ -1067,7 +1067,7 @@ private void menuItemConvert_Click(object sender, System.EventArgs e)
/// </summary>
private void menuItemHelp_Click(object sender, System.EventArgs e)
{
- System.Diagnostics.Process.Start("http://www.xboxmediacenter.com/wiki/index.php?title=XBMC_Translator");
+ System.Diagnostics.Process.Start("http://xbmc.org/wiki/index.php?title=XBMC_Translator");
}
/// <summary>
View
2  xbmc/Application.cpp
@@ -1,6 +1,6 @@
/*
* Copyright (C) 2005-2008 Team XBMC
- * http://www.xbmc.org
+ * http://xbmc.org
*
* This Program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
View
2  xbmc/Application.h
@@ -2,7 +2,7 @@
/*
* Copyright (C) 2005-2008 Team XBMC
- * http://www.xbmc.org
+ * http://xbmc.org
*
* This Program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
View
2  xbmc/Crc32.h
@@ -1,7 +1,7 @@
#pragma once
/*
-* XBoxMediaPlayer
+* XBMC Media Center
* Copyright (c) 2002 d7o3g4q and RUNTiME
* Portions Copyright (c) by the authors of ffmpeg and xvid
*
View
2  xbmc/FileSystem/File.cpp
@@ -1,5 +1,5 @@
/*
-* XBoxMediaPlayer
+* XBMC Media Center
* Copyright (c) 2002 Frodo
* Portions Copyright (c) by the authors of ffmpeg and xvid
*
View
2  xbmc/FileSystem/File.h
@@ -1,5 +1,5 @@
/*
-* XBoxMediaPlayer
+* XBMC Media Center
* Copyright (c) 2002 Frodo
* Portions Copyright (c) by the authors of ffmpeg and xvid
*
View
2  xbmc/FileSystem/FileFileReader.cpp
@@ -1,7 +1,7 @@
#include "stdafx.h"
/*
- * XBoxMediaPlayer
+ * XBMC Media Center
* Copyright (c) 2002 Frodo
* Portions Copyright (c) by the authors of ffmpeg and xvid
*
View
2  xbmc/FileSystem/FileFileReader.h
@@ -1,6 +1,6 @@
#pragma once
/*
- * XBoxMediaPlayer
+ * XBMC Media Center
* Copyright (c) 2002 Frodo
* Portions Copyright (c) by the authors of ffmpeg and xvid
*
View
2  xbmc/FileSystem/FileHD.cpp
@@ -1,7 +1,7 @@
#include "stdafx.h"
/*
- * XBoxMediaPlayer
+ * XBMC Media Center
* Copyright (c) 2002 Frodo
* Portions Copyright (c) by the authors of ffmpeg and xvid
*
View
2  xbmc/FileSystem/FileHD.h
@@ -1,5 +1,5 @@
/*
- * XBoxMediaPlayer
+ * XBMC Media Center
* Copyright (c) 2002 Frodo
* Portions Copyright (c) by the authors of ffmpeg and xvid
*
View
2  xbmc/FileSystem/FileISO.cpp
@@ -1,5 +1,5 @@
/*
-* XBoxMediaPlayer
+* XBMC Media Center
* Copyright (c) 2002 Frodo
* Portions Copyright (c) by the authors of ffmpeg and xvid
*
View
2  xbmc/FileSystem/FileISO.h
@@ -1,5 +1,5 @@
/*
-* XBoxMediaPlayer
+* XBMC Media Center
* Copyright (c) 2002 Frodo
* Portions Copyright (c) by the authors of ffmpeg and xvid
*
View
2  xbmc/FileSystem/FileXBMSP.cpp
@@ -1,5 +1,5 @@
/*
-* XBoxMediaPlayer
+* XBMC Media Center
* Copyright (c) 2002 Frodo
* Portions Copyright (c) by the authors of ffmpeg and xvid
*
View
2  xbmc/FileSystem/FileXBMSP.h
@@ -1,5 +1,5 @@
/*
-* XBoxMediaPlayer
+* XBMC Media Center
* Copyright (c) 2002 Frodo
* Portions Copyright (c) by the authors of ffmpeg and xvid
*
View
2  xbmc/FileSystem/IFile.cpp
@@ -1,5 +1,5 @@
/*
-* XBoxMediaPlayer
+* XBMC Media Center
* Copyright (c) 2002 Frodo
* Portions Copyright (c) by the authors of ffmpeg and xvid
*
View
2  xbmc/FileSystem/IFile.h
@@ -1,5 +1,5 @@
/*
-* XBoxMediaPlayer
+* XBMC Media Center
* Copyright (c) 2002 Frodo
* Portions Copyright (c) by the authors of ffmpeg and xvid
*
View
2  xbmc/FileSystem/UPnPDirectory.cpp
@@ -179,7 +179,7 @@ CUPnPDirectory::GetDirectory(const CStdString& strPath, CFileItemList &items)
}
// same thing but special case for XBMC
- if (root_id == "0" && ((*device)->m_ModelName.Find("XBMC", 0, true) >= 0)) {
+ if (root_id == "0" && (((*device)->m_ModelName.Find("XBMC", 0, true) >= 0) || ((*device)->m_ModelName.Find("Xbox Media Center", 0, true) >= 0))) {
// look for a specific type to differentiate which folder we want
if (audio && !video && !image) {
View
23 xbmc/Profile.cpp
@@ -1,6 +1,6 @@
/*
* Copyright (C) 2005-2008 Team XBMC
- * http://www.xbmc.org
+ * http://xbmc.org
*
* This Program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -19,27 +19,6 @@
*
*/
-/*
- * Copyright (C) 2005-2007 Team XboxMediaCenter
- * http://www.xboxmediacenter.com
- *
- * This Program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This Program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Make; see the file COPYING. If not, write to
- * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
- * http://www.gnu.org/copyleft/gpl.html
- *
- */
-
#include "stdafx.h"
#include "Profile.h"
#include "utils/GUIInfoManager.h"
View
2  xbmc/Settings.h
@@ -1,7 +1,7 @@
#pragma once
/*
* Copyright (C) 2005-2008 Team XBMC
- * http://www.xbmc.org
+ * http://xbmc.org
*
* This Program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
View
2  xbmc/cores/VideoRenderers/LinuxRendererATI.cpp
@@ -1,5 +1,5 @@
/*
-* XBoxMediaCenter
+* XBMC Media Center
* Linux OpenGL Renderer for ATI cards
* Copyright (c) 2007 Frodo/jcmarshall/vulkanr/d4rk
*
View
2  xbmc/cores/VideoRenderers/LinuxRendererGL.cpp
@@ -1,5 +1,5 @@
/*
-* XBoxMediaCenter
+* XBMC Media Center
* Linux OpenGL Renderer
* Copyright (c) 2007 Frodo/jcmarshall/vulkanr/d4rk
*
View
2  xbmc/cores/VideoRenderers/VideoShaders/VideoFilterShader.cpp
@@ -1,5 +1,5 @@
/*
-* XBoxMediaCenter
+* XBMC Media Center
* Video Filter Classes
* Copyright (c) 2007 d4rk
*
View
2  xbmc/cores/VideoRenderers/VideoShaders/YUV2RGBShader.cpp
@@ -1,5 +1,5 @@
/*
-* XBoxMediaCenter
+* XBMC Media Center
* Shader Classes
* Copyright (c) 2007 d4rk
*
View
2  xbmc/cores/dvdplayer/ALSADirectSound.cpp
@@ -1,6 +1,6 @@
#ifndef __APPLE__
/*
-* XBoxMediaPlayer
+* XBMC Media Center
* Copyright (c) 2002 d7o3g4q and RUNTiME
* Portions Copyright (c) by the authors of ffmpeg and xvid
*
View
2  xbmc/cores/dvdplayer/ALSADirectSound.h
@@ -1,5 +1,5 @@
/*
-* XBoxMediaPlayer
+* XBMC Media Center
* Copyright (c) 2002 d7o3g4q and RUNTiME
* Portions Copyright (c) by the authors of ffmpeg and xvid
*
View
2  xbmc/cores/dvdplayer/PortaudioDirectSound.cpp
@@ -1,6 +1,6 @@
#ifdef __APPLE__
/*
-* XBoxMediaPlayer
+* XBMC Media Center
* Copyright (c) 2002 d7o3g4q and RUNTiME
* Portions Copyright (c) by the authors of ffmpeg and xvid
*
View
2  xbmc/cores/dvdplayer/PortaudioDirectSound.h
@@ -1,5 +1,5 @@
/*
-* XBoxMediaPlayer
+* XBMC Media Center
* Copyright (c) 2002 d7o3g4q and RUNTiME
* Portions Copyright (c) by the authors of ffmpeg and xvid
*
View
2  xbmc/cores/mplayer/IDirectSoundRenderer.h
@@ -1,5 +1,5 @@
/*
-* XBoxMediaPlayer
+* XBMC Media Center
* Copyright (c) 2002 d7o3g4q and RUNTiME
* Portions Copyright (c) by the authors of ffmpeg and xvid
*
View
2  xbmc/cores/mplayer/Win32DirectSound.cpp
@@ -1,5 +1,5 @@
/*
-* XBoxMediaPlayer
+* XBMC Media Center
* Copyright (c) 2002 d7o3g4q and RUNTiME
* Portions Copyright (c) by the authors of ffmpeg and xvid
*
View
2  xbmc/cores/mplayer/Win32DirectSound.h
@@ -1,5 +1,5 @@
/*
-* XBoxMediaPlayer
+* XBMC Media Center
* Copyright (c) 2002 d7o3g4q and RUNTiME
* Portions Copyright (c) by the authors of ffmpeg and xvid
*
View
2  xbmc/cores/paplayer/MP3Codec/MADCodec/MadMp3Decoder.cpp
@@ -1,6 +1,6 @@
/****************************************************************************
-XboxMediaCenter MadMp3Decoder, September 2005 by chadoe
+XBMC Media Center MadMp3Decoder, September 2005 by chadoe
Parts based on madxlib (c) 2005 J. A. Robson which was based on the madlld/madlldlib sources. Madlld comments have been
preserved and noted.
View
2  xbmc/doxygen.hpp
@@ -59,7 +59,7 @@
\section links Links
Related links
- XBMC - http://www.xbmc.org \n
+ XBMC - http://xbmc.org \n
XBMC Forum - http://xbmc.org/forum/index.php \n
*/
View
2  xbmc/lib/cximage-6.0/zlib/config.log
@@ -236,7 +236,7 @@ LN_S='ln -s'
LTLIBOBJS=''
LZO_INCLUDES=' -DDBUS_API_SUBJECT_TO_CHANGE -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/hal -I/usr/include/lzo'
OBJEXT='o'
-PACKAGE_BUGREPORT='bugs@xboxmediacenter.com'
+PACKAGE_BUGREPORT='bugs@xbmc.org'
PACKAGE_NAME='"xbmc"'
PACKAGE_STRING='"xbmc" 2.1'
PACKAGE_TARNAME='-xbmc-'
View
50 xbmc/lib/libGoAhead/XBMCConfiguration.cpp
@@ -44,7 +44,7 @@ CXbmcConfiguration::~CXbmcConfiguration()
}
/*
- * Load XboxMediaCenter.xml
+ * Load sources.xml
*/
int CXbmcConfiguration::Load()
{
@@ -93,11 +93,11 @@ int CXbmcConfiguration::BookmarkSize( int eid, webs_t wp, CStdString& response,
else response="<li>Error:Bookmark type does not exist";
return -1;
-/* // load xboxmediacenter.xml, write a messages if file could not be loaded
+/* // load sources.xml, write a messages if file could not be loaded
if (Load() == -1)
{
- eid!=-1 ? websError(wp, 500, T("Could not load XboxMediaCenter.xml\n")):
- response="<li>Error:Could not load XboxMediaCenter.xml";
+ eid!=-1 ? websError(wp, 500, T("Could not load sources.xml\n")):
+ response="<li>Error:Could not load sources.xml";
return -1;
}
@@ -201,11 +201,11 @@ int CXbmcConfiguration::GetBookmark( int eid, webs_t wp, CStdString& response, i
return -1;
- /*// load xboxmediacenter.xml, write a messages if file could not be loaded
+ /*// load sources.xml, write a messages if file could not be loaded
if (Load() == -1)
{
- eid!=-1 ? websError(wp, 500, T("Could not load XboxMediaCenter.xml\n")):
- response="<li>Error:Could not load XboxMediaCenter.xml";
+ eid!=-1 ? websError(wp, 500, T("Could not load sources.xml\n")):
+ response="<li>Error:Could not load sources.xml";
return -1;
}
@@ -322,11 +322,11 @@ int CXbmcConfiguration::AddBookmark( int eid, webs_t wp, CStdString& response, i
return 0;
/*
- // load xboxmediacenter.xml, write a messages if file could not be loaded
+ // load sources.xml, write a messages if file could not be loaded
if (Load() == -1)
{
- eid!=-1 ? websError(wp, 500, T("Could not load XboxMediaCenter.xml\n")):
- response="<li>Error:Could not load XboxMediaCenter.xml";
+ eid!=-1 ? websError(wp, 500, T("Could not load sources.xml\n")):
+ response="<li>Error:Could not load sources.xml";
return -1;
}
@@ -421,11 +421,11 @@ int CXbmcConfiguration::SaveBookmark( int eid, webs_t wp, CStdString& response,
return -1;
-/* // load xboxmediacenter.xml, write a messages if file could not be loaded
+/* // load sources.xml, write a messages if file could not be loaded
if (Load() == -1)
{
- eid!=-1 ? websError(wp, 500, T("Could not load XboxMediaCenter.xml\n")):
- response="<li>Error:Could not load XboxMediaCenter.xml";
+ eid!=-1 ? websError(wp, 500, T("Could not load sources.xml\n")):
+ response="<li>Error:Could not load sources.xml";
return -1;
}
@@ -498,11 +498,11 @@ int CXbmcConfiguration::RemoveBookmark( int eid, webs_t wp, CStdString& response
else response="<li>Error:Position not found";
return -1;
/*
- // load xboxmediacenter.xml, write a messages if file could not be loaded
+ // load sources.xml, write a messages if file could not be loaded
if (Load() == -1)
{
- eid!=-1 ? websError(wp, 500, T("Could not load XboxMediaCenter.xml\n")):
- response="<li>Error:Could not load XboxMediaCenter.xml";
+ eid!=-1 ? websError(wp, 500, T("Could not load sources.xml\n")):
+ response="<li>Error:Could not load sources.xml";
return -1;
}
@@ -557,11 +557,11 @@ int CXbmcConfiguration::SaveConfiguration( int eid, webs_t wp, CStdString& respo
return -1;
}
- // load xboxmediacenter.xml, write a messages if file could not be loaded
+ // load sources.xml, write a messages if file could not be loaded
if (Load() == -1)
{
- if (eid!=-1) websError(wp, 500, T((char*)"Could not load XboxMediaCenter.xml\n"));
- else response="<li>Error:Could not load XboxMediaCenter.xml";
+ if (eid!=-1) websError(wp, 500, T((char*)"Could not load sources.xml\n"));
+ else response="<li>Error:Could not load sources.xml";
return -1;
}
@@ -602,11 +602,11 @@ return -1;
return -1;
}
- // load xboxmediacenter.xml, write a messages if file could not be loaded
+ // load sources.xml, write a messages if file could not be loaded
if (Load() == -1)
{
- eid!=-1 ? websError(wp, 500, T("Could not load XboxMediaCenter.xml\n")):
- response="<li>Error:Could not load XboxMediaCenter.xml";;
+ eid!=-1 ? websError(wp, 500, T("Could not load sources.xml\n")):
+ response="<li>Error:Could not load sources.xml";;
return -1;
}
@@ -618,10 +618,6 @@ return -1;
if (pElement)
{
- // if we have another child, this isn't an option like
- // <xboxmediacenter>
- // <home>c:\</home>
- // <xboxmediacenter>
if (pElement->FirstChild() && pElement->FirstChild()->FirstChild() == NULL)
{
char* value = (char*)pElement->FirstChild()->Value();
@@ -671,7 +667,7 @@ int CXbmcConfiguration::SetOption( int eid, webs_t wp, CStdString& response, int
}
/*
- * Check if option is a valid one in xboxmediacenter.xml
+ * Check if option is a valid one in sources.xml
*/
bool CXbmcConfiguration::IsValidOption(char* option)
{
View
4 xbmc/lib/libPython/xbmcmodule/control.cpp
@@ -177,7 +177,7 @@ namespace PYXBMC
"visible : string - Visible condition.\n"
"allowHiddenFocus : bool - True=gains focus even if hidden.\n"
"\n"
- "List of Conditions - http://www.xboxmediacenter.com/wiki/index.php?title=List_of_Boolean_Conditions \n"
+ "List of Conditions - http://xbmc.org/wiki/index.php?title=List_of_Boolean_Conditions \n"
"\n"
"example:\n"
" - self.button.setVisibleCondition('[Control.IsVisible(41) + !Control.IsVisible(12)]', True)\n");
@@ -207,7 +207,7 @@ namespace PYXBMC
"\n"
"enable : string - Enable condition.\n"
"\n"
- "List of Conditions - http://www.xboxmediacenter.com/wiki/index.php?title=List_of_Boolean_Conditions \n"
+ "List of Conditions - http://xbmc.org/wiki/index.php?title=List_of_Boolean_Conditions \n"
"\n"
"example:\n"
" - self.button.setEnableCondition('System.InternetState')\n");
View
2  xbmc/lib/libPython/xbmcmodule/pyutil.h
@@ -29,7 +29,7 @@ extern "C" {
#endif
// credits and version information
-#define PY_XBMC_AUTHOR "J. Mulder <darkie@xboxmediacenter.com>"
+#define PY_XBMC_AUTHOR "J. Mulder <darkie@xbmc.org>"
#define PY_XBMC_CREDITS "XBMC TEAM."
#define PY_XBMC_PLATFORM "XBOX"
View
2  xbmc/lib/libexif/ExifParse.cpp
@@ -1,6 +1,6 @@
/*
* Copyright (C) 2005-2007 Team XboxMediaCenter
- * http://www.xboxmediacenter.com
+ * http://xbmc.org
*
* This Program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
View
2  xbmc/lib/libexif/IptcParse.cpp
@@ -1,6 +1,6 @@
/*
* Copyright (C) 2005-2007 Team XboxMediaCenter
- * http://www.xboxmediacenter.com
+ * http://xbmc.org
*
* This Program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
View
2  xbmc/lib/libexif/JpegParse.cpp
@@ -1,6 +1,6 @@
/*
* Copyright (C) 2005-2007 Team XboxMediaCenter
- * http://www.xboxmediacenter.com
+ * http://xbmc.org
*
* This Program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
View
2  xbmc/linux/XCriticalSection.cpp
@@ -1,5 +1,5 @@
/*
-* XBoxMediaPlayer
+* XBMC Media Center
* Copyright (c) 2002 Frodo
* Portions Copyright (c) by the authors of ffmpeg and xvid
*
View
2  xbmc/utils/CriticalSection.cpp
@@ -1,5 +1,5 @@
/*
-* XBoxMediaPlayer
+* XBMC Media Center
* Copyright (c) 2002 Frodo
* Portions Copyright (c) by the authors of ffmpeg and xvid
*
View
2  xbmc/utils/Event.cpp
@@ -1,5 +1,5 @@
/*
-* XBoxMediaPlayer
+* XBMC Media Center
* Copyright (c) 2002 Frodo
* Portions Copyright (c) by the authors of ffmpeg and xvid
*
View
2  xbmc/utils/Event.h
@@ -11,7 +11,7 @@
/*
-* XBoxMediaPlayer
+* XBMC Media Center
* Copyright (c) 2002 Frodo
* Portions Copyright (c) by the authors of ffmpeg and xvid
*
View
2  xbmc/utils/SingleLock.cpp
@@ -1,5 +1,5 @@
/*
- * XBoxMediaPlayer
+ * XBMC Media Center
* Copyright (c) 2002 Frodo
* Portions Copyright (c) by the authors of ffmpeg and xvid
*
View
2  xbmc/utils/SingleLock.h
@@ -10,7 +10,7 @@
#endif // _MSC_VER > 1000
/*
- * XBoxMediaPlayer
+ * XBMC Media Center
* Copyright (c) 2002 Frodo
* Portions Copyright (c) by the authors of ffmpeg and xvid
*
View
2  xbmc/utils/Thread.cpp
@@ -1,5 +1,5 @@
/*
-* XBoxMediaPlayer
+* XBMC Media Center
* Copyright (c) 2002 Frodo
* Portions Copyright (c) by the authors of ffmpeg and xvid
*
View
2  xbmc/utils/UdpClient.h
@@ -1,7 +1,7 @@
#pragma once
/*
-* XBoxMediaPlayer
+* XBMC Media Center
* Copyright (c) 2002 Frodo
* Portions Copyright (c) by the authors of ffmpeg and xvid
*
View
2  xbmc/visualizations/XBMCProjectM/Main.cpp
@@ -30,7 +30,7 @@ www.gamedev.net/reference/programming/features/beatdetection/
--
"ported" to XBMC by d4rk
-d4rk@xboxmediacenter.com
+d4rk@xbmc.org
*/
View
6 xbmc/win32/XBMC_PC.cpp
@@ -59,7 +59,7 @@ CXBMC_PC::CXBMC_PC()
m_dwWindowStyle = 0;
m_dwCreationWidth = 720;
m_dwCreationHeight = 576;
- m_strWindowTitle = "XBoxMediaCenter PC Skin Preview";
+ m_strWindowTitle = "XBMC Media Center PC Skin Preview";
m_active = false;
m_focused = false;
m_closing = false;
@@ -349,7 +349,7 @@ HRESULT CXBMC_PC::Create( HINSTANCE hInstance, LPSTR commandLine )
LoadIcon( hInstance, MAKEINTRESOURCE(IDI_MAIN_ICON) ),
LoadCursor( NULL, IDC_ARROW ),
(HBRUSH)GetStockObject(WHITE_BRUSH),
- NULL, _T("XBoxMediaCenterPC") };
+ NULL, _T("XBMCMediaCenterPC") };
RegisterClass( &wndClass );
HMENU toolMenu;
// Set the window's initial style
@@ -371,7 +371,7 @@ HRESULT CXBMC_PC::Create( HINSTANCE hInstance, LPSTR commandLine )
// Create the render window
//int foo = rc.bottom-rc.top;
- m_hWnd = CreateWindow(_T("XBoxMediaCenterPC"), m_strWindowTitle.c_str(), m_dwWindowStyle,
+ m_hWnd = CreateWindow(_T("XBMCMediaCenterPC"), m_strWindowTitle.c_str(), m_dwWindowStyle,
0, 0, (rc.right-rc.left), (rc.bottom-rc.top), 0L, toolMenu , hInstance, 0L );
}
View
2  xbmc/win32/XCriticalSection.cpp
@@ -1,5 +1,5 @@
/*
-* XBoxMediaPlayer
+* XBMC Media Center
* Copyright (c) 2002 Frodo
* Portions Copyright (c) by the authors of ffmpeg and xvid
*
View
2  xbmc/xbox/IoSupport.cpp
@@ -1,5 +1,5 @@
/*
-* XBoxMediaPlayer
+* XBMC Media Center
* Copyright (c) 2002 d7o3g4q and RUNTiME
* Portions Copyright (c) by the authors of ffmpeg and xvid
*
View
2  xbmc/xbox/IoSupport.h
@@ -1,5 +1,5 @@
/*
-* XBoxMediaPlayer
+* XBMC Media Center
* Copyright (c) 2002 d7o3g4q and RUNTiME
* Portions Copyright (c) by the authors of ffmpeg and xvid
*
Please sign in to comment.
Something went wrong with that request. Please try again.