Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

RetroPlayer proof-of-concept #3335

Closed
wants to merge 19 commits into from
Closed
Show file tree
Hide file tree
Changes from 12 commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
2b79d61
[temp] Always log at log level DEBUG
garbear Sep 12, 2013
290f088
[temp] ActiveAE: Make ActiveAE default Audio Engine to get it tested
fritsch Jul 14, 2013
8a0c0e2
Joystick API (PR:2370 - https://github.com/xbmc/xbmc/pull/2370)
garbear Sep 11, 2013
2080419
Refactor CKeyboardStat so that an event can be translated to a key wi…
garbear Feb 26, 2013
9e974bb
Added game info tags to XBMC. This is mostly a stop-gap implementatio…
garbear Sep 11, 2013
8ab7024
Refactor service starting/stopping using a callback-based interface w…
garbear Sep 5, 2013
b1389fc
[game clients] Added new Game Client add-ons based on the libretro API.
garbear Sep 12, 2013
31894ee
[retroplayer] Added RetroPlayer, a new player core that enables game …
garbear Sep 12, 2013
2d94125
[retroplayer] Added keyboard and joystick input handling to RetroPlay…
garbear Sep 12, 2013
a9d8b57
[games] Add new type of add-on, xbmc.addon.game, plugins and scripts …
garbear Sep 12, 2013
70c176f
[games] Add MyGames window to the GUI
garbear Sep 12, 2013
62d414f
[game clients] Add win32 and linux repositories for game client add-ons
garbear Aug 31, 2013
a2e4dcd
[joystick] - fix compilation if HAS_JOYSTICK is undefined
Memphiz Sep 27, 2013
6237b83
[osx/ios/atv2] - sync xcode projects
Memphiz Sep 27, 2013
8d4a81e
[cosmetic] Add TODO and, move TODO to header, and remove unneccessary…
garbear Sep 30, 2013
496b3c5
Fix game clients failing to find system directories when path has a t…
garbear Oct 5, 2013
55f2787
Fix compile on windows
garbear Oct 7, 2013
1a835c4
Made RETRO_ENFIRONMENT_GET_VARIABLE call only return default value
topfs2 Oct 7, 2013
7033319
Merge pull request #12 from topfs2/retroplayer-pr
garbear Oct 23, 2013
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 7 additions & 0 deletions Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ DIRECTORY_ARCHIVES=$(DVDPLAYER_ARCHIVES) \
xbmc/cores/DllLoader/exports/exports.a \
xbmc/cores/DllLoader/exports/util/exports_utils.a \
xbmc/cores/ExternalPlayer/ExternalPlayer.a \
xbmc/cores/RetroPlayer/retroplayer.a \
xbmc/cores/VideoRenderers/VideoRenderer.a \
xbmc/cores/VideoRenderers/VideoShaders/VideoShaders.a \
xbmc/cores/cores.a \
Expand All @@ -50,6 +51,10 @@ DIRECTORY_ARCHIVES=$(DVDPLAYER_ARCHIVES) \
xbmc/filesystem/MusicDatabaseDirectory/musicdatabasedirectory.a \
xbmc/filesystem/VideoDatabaseDirectory/videodatabasedirectory.a \
xbmc/filesystem/filesystem.a \
xbmc/games/games.a \
xbmc/games/libretro/libretro.a \
xbmc/games/tags/gameinfotags.a \
xbmc/games/windows/gamewindows.a \
xbmc/guilib/guilib.a \
xbmc/input/input.a \
xbmc/interfaces/generic/interfaces-generic.a \
Expand Down Expand Up @@ -299,11 +304,13 @@ GTEST_INCLUDES = -I$(GTEST_DIR)/include
GTEST_LIBS = $(GTEST_DIR)/lib/.libs/libgtest.a

CHECK_DIRS = xbmc/filesystem/test \
xbmc/games/test \
xbmc/utils/test \
xbmc/threads/test \
xbmc/interfaces/python/test \
xbmc/test
CHECK_LIBS = xbmc/filesystem/test/filesystemTest.a \
xbmc/games/test/gamesTest.a \
xbmc/utils/test/utilsTest.a \
xbmc/threads/test/threadTest.a \
xbmc/interfaces/python/test/pythonSwigTest.a \
Expand Down
23 changes: 23 additions & 0 deletions addons/repository.libretro-linux/addon.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<addon id="repository.libretro-linux"
name="Libretro Emulators"
version="1.0.2"
provider-name="garbear">
<requires>
<import addon="xbmc.addon" version="12.0.0"/>
<import addon="xbmc.libretro" version="1.0.0"/>
</requires>
<extension point="xbmc.addon.repository" name="Libretro Emulators">
<info compressed="false">https://raw.github.com/garbear/repository.libretro/master/release/linux/addons.xml</info>
<checksum>https://raw.github.com/garbear/repository.libretro/master/release/linux/addons.xml.md5</checksum>
<datadir zip="true">https://raw.github.com/garbear/repository.libretro/master/release/linux/</datadir>
<hashes>true</hashes>
</extension>

This comment was marked as spam.

<extension point="xbmc.addon.metadata">
<summary>Libretro Emulators</summary>
<description>This repository contains emulators for the RetroPlayer branch of XBMC.</description>
<disclaimer>The owners and submitters to this repository do not host or distribute any of the content displayed by these addons nor do they have any affiliation with the content providers. Team XBMC did not make all the add-ons on this repository and are not responsible for their content.</disclaimer>
<platform>linux</platform>
<nofanart>true</nofanart>
</extension>
</addon>
Binary file added addons/repository.libretro-linux/icon.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
23 changes: 23 additions & 0 deletions addons/repository.libretro-win32/addon.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<addon id="repository.libretro-win32"
name="Libretro Emulators"
version="1.0.2"
provider-name="garbear">
<requires>
<import addon="xbmc.addon" version="12.0.0"/>
<import addon="xbmc.libretro" version="1.0.0"/>
</requires>
<extension point="xbmc.addon.repository" name="Libretro Emulators">
<info compressed="false">https://raw.github.com/garbear/repository.libretro/master/release/win32/addons.xml</info>
<checksum>https://raw.github.com/garbear/repository.libretro/master/release/win32/addons.xml.md5</checksum>
<datadir zip="true">https://raw.github.com/garbear/repository.libretro/master/release/win32/</datadir>
<hashes>true</hashes>
</extension>
<extension point="xbmc.addon.metadata">
<summary>Libretro Emulators</summary>
<description>This repository contains emulators for the RetroPlayer branch of XBMC.</description>
<disclaimer>The owners and submitters to this repository do not host or distribute any of the content displayed by these addons nor do they have any affiliation with the content providers. Team XBMC did not make all the add-ons on this repository and are not responsible for their content.</disclaimer>
<platform>windx wingl</platform>
<nofanart>true</nofanart>
</extension>
</addon>
Binary file added addons/repository.libretro-win32/icon.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
14 changes: 14 additions & 0 deletions addons/skin.confluence/720p/Home.xml
Original file line number Diff line number Diff line change
Expand Up @@ -788,6 +788,13 @@
<visible>Container(9000).HasFocus(4)</visible>
<include>HomeSubMenuPictures</include> <!-- Buttons for the grouplist -->
</control>
<control type="grouplist" id="9016">
<include>HomeSubMenuCommonValues</include>
<onleft>9016</onleft>
<onright>9016</onright>
<visible>Container(9000).HasFocus(13)</visible>
<include>HomeSubMenuGames</include> <!-- Buttons for the grouplist -->
</control>
</control>
<control type="image">
<posx>-100</posx>
Expand Down Expand Up @@ -936,6 +943,13 @@
<thumb>-</thumb>
<visible>!Skin.HasSetting(HomeMenuNoMusicButton)</visible>
</item>
<item id="13">
<label>[UPPERCASE]$LOCALIZE[15016][/UPPERCASE]</label>
<onclick>ActivateWindow(Games)</onclick>
<icon>-</icon>
<thumb>-</thumb>
<visible>!Skin.HasSetting(HomeMenuNoGamesButton)</visible>
</item>
<item id="1">
<label>31957</label>
<onclick condition="!System.Platform.Android">ActivateWindow(Programs,Addons,return)</onclick>
Expand Down
23 changes: 22 additions & 1 deletion addons/skin.confluence/720p/IncludesHomeMenuItems.xml
Original file line number Diff line number Diff line change
Expand Up @@ -283,7 +283,28 @@
<texture border="0,0,0,3">HomeSubEnd.png</texture>
</control>
</include>

<include name="HomeSubMenuGames">
<control type="image" id="90181">
<width>35</width>
<height>35</height>
<texture border="0,0,0,3" flipx="true">HomeSubEnd.png</texture>
</control>
<control type="button" id="90182">
<include>ButtonHomeSubCommonValues</include>
<label>744</label>
<onclick>ActivateWindow(Games,Files,return)</onclick>
</control>
<control type="button" id="90183">
<include>ButtonHomeSubCommonValues</include>
<label>24001</label>
<onclick>ActivateWindow(Games,Addons,return)</onclick>
</control>
<control type="image" id="90184">
<width>35</width>
<height>35</height>
<texture border="0,0,0,3">HomeSubEnd.png</texture>
</control>
</include>
<include name="HomeAddonItemsVideos">
<item>
<label>$INFO[system.addontitle(Skin.String(HomeVideosButton1))]</label>
Expand Down
95 changes: 95 additions & 0 deletions addons/skin.confluence/720p/MyGames.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,95 @@
<window>
<defaultcontrol always="true">50</defaultcontrol>
<allowoverlay>no</allowoverlay>
<onload condition="!Skin.HasSetting(FirstTimeRun)">ActivateWindow(1112)</onload>
<views>50,51,500</views>
<controls>
<include>CommonBackground</include>
<include>ContentPanelBackgrounds</include>
<control type="group">
<include>Window_OpenClose_Animation</include>
<include>CommonRootView</include> <!-- view id = 50 -->
<include>FullWidthList</include> <!-- view id = 51 -->
<include>ThumbnailView</include> <!-- view id = 500 -->
</control>
<include>CommonPageCount</include>
<include>CommonNowPlaying</include>
<include>MainWindowMouseButtons</include>
<include>BehindDialogFadeOut</include>
<include>ScrollOffsetLabel</include>
<control type="image">
<description>Section header image</description>
<posx>20</posx>
<posy>3</posy>
<width>35</width>
<height>35</height>
<aspectratio>keep</aspectratio>
<texture>icon_pictures.png</texture>
</control>
<control type="grouplist">
<posx>65</posx>
<posy>5</posy>
<width>1000</width>
<height>30</height>
<orientation>horizontal</orientation>
<align>left</align>
<itemgap>5</itemgap>
<control type="label">
<include>WindowTitleCommons</include>
<label>$LOCALIZE[15016]</label>
</control>
<control type="label">
<include>WindowTitleCommons</include>
<label>[COLOR=blue] - [/COLOR]$INFO[Container.FolderName]</label>
<visible>!IsEmpty(Container.FolderName)</visible>
</control>
</control>
<control type="group">
<posx>-250</posx>
<include>SideBladeLeft</include>
<control type="grouplist" id="9000">
<posx>0</posx>
<posy>110</posy>
<width>250</width>
<height>600</height>
<onleft>9000</onleft>
<onright>50</onright>
<onup>9000</onup>
<ondown>9000</ondown>
<onback>50</onback>
<itemgap>0</itemgap>
<control type="label" id="200">
<width>250</width>
<height>35</height>
<font>font12</font>
<label>31006</label>
<textcolor>blue</textcolor>
<align>center</align>
<aligny>center</aligny>
</control>
<control type="button" id="2">
<description>View As button</description>
<textwidth>235</textwidth>
<include>ButtonCommonValues</include>
<label>-</label>
</control>
<control type="button" id="3">
<description>Sort by button</description>
<include>ButtonCommonValues</include>
<label>103</label>
</control>
<control type="togglebutton" id="4">
<description>Sort asc</description>
<include>ButtonCommonValues</include>
<alttexturefocus border="5">button-focus.png</alttexturefocus>
<alttexturenofocus>-</alttexturenofocus>
<label>31051</label>
<altlabel>31050</altlabel>
<usealttexture>Container.SortDirection(Ascending)</usealttexture>
</control>
<include>CommonNowPlaying_Controls</include>
</control>
</control>
<include>Clock</include>
</controls>
</window>
12 changes: 9 additions & 3 deletions addons/skin.confluence/720p/Settings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -147,24 +147,30 @@
<icon>-</icon>
</item>
<item id="6">
<label>15016</label>
<label2>31407</label2>
<onclick>ActivateWindow(GamesSettings)</onclick>
<icon>-</icon>
</item>
<item id="7">
<label>8</label>
<label2>31404</label2>
<onclick>ActivateWindow(WeatherSettings)</onclick>
<icon>-</icon>
</item>
<item id="7">
<item id="8">
<label>24001</label>
<label2>31408</label2>
<onclick>ActivateWindow(AddonBrowser)</onclick>
<icon>-</icon>
</item>
<item id="8">
<item id="9">
<label>14036</label>
<label2>31410</label2>
<onclick>ActivateWindow(ServiceSettings)</onclick>
<icon>-</icon>
</item>
<item id="9">
<item id="10">
<label>13000</label>
<label2>31406</label2>
<onclick>ActivateWindow(SystemSettings)</onclick>
Expand Down
4 changes: 3 additions & 1 deletion addons/skin.confluence/language/English/strings.po
Original file line number Diff line number Diff line change
Expand Up @@ -530,7 +530,9 @@ msgctxt "#31406"
msgid "[B]CONFIGURE SYSTEM SETTINGS[/B][CR][CR]Setup and calibrate displays · Configure audio output · Setup remote controls[CR]Set power saving options · Enable debugging · Setup master lock"
msgstr ""

#empty string with id 31407
msgctxt "#31407"
msgid "[B]CONFIGURE GAME SETTINGS[/B][CR][CR]All your base are belong[CR]to us"
msgstr ""

msgctxt "#31408"
msgid "[B]CONFIGURE ADD-ONS[/B][CR][CR]Manage your installed Add-ons · Browse for and install Add-ons from xbmc.org[CR]Modify Add-on settings"
Expand Down
Binary file added addons/skin.confluence/media/DefaultAddonGame.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
7 changes: 7 additions & 0 deletions addons/xbmc.libretro/addon.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<addon id="xbmc.libretro" version="1.0.0" provider-name="Team XBMC">
<backwards-compatibility abi="1.0.0"/>
<requires>
<import addon="xbmc.core" version="0.1.0"/>
</requires>
</addon>
3 changes: 3 additions & 0 deletions configure.in
Original file line number Diff line number Diff line change
Expand Up @@ -2031,6 +2031,9 @@ else
final_message="$final_message\n Joystick:\tNo"
fi

# --enable-joystick is for SDL joysticks, use joystick.h for Linux Joystick API
AC_CHECK_HEADER([linux/joystick.h], AC_DEFINE([HAS_LINUX_JOYSTICK],[1],[Define if we have linux/joystick.h]),)

if test "$use_xrandr" = "yes"; then
final_message="$final_message\n XRandR:\tYes"
USE_XRANDR=1
Expand Down