[feature] clear song cache from DTA, log content name/mount

Author: InvoxiPlayGames

include/GlobalSymbols.h

@@ -25,6 +25,7 @@ typedef struct _GlobalSymbols
     Symbol rb3e_get_album;
     Symbol rb3e_get_origin;
     Symbol rb3e_get_genre;
+    Symbol rb3e_delete_songcache;
 
     // modifiers
     Symbol forceHopos;

include/config.h

@@ -28,6 +28,7 @@ typedef struct _RB3E_Config
     char RawfilesDir[RB3E_MAX_CONFIG_LEN];
     char DisableRawfiles;
     char QuazalLogging;
+    char ContentLogging;
     // [Graphics]
     int RenderResX;
     int RenderResY;

include/ports_xbox360.h

@@ -150,6 +150,8 @@
 #define PORT_DATAONELEM 0x8275ff50                   // DataOnElem
 #define PORT_DATANODEGETOBJ 0x8274b088               // DataNode::GetObj
 #define PORT_DXRND_SUSPEND 0x8273A370                // DxRnd::Suspend
+#define PORT_XBOXCONTENT_CONSTRUCTOR 0x8251fb40      // XboxContent::__ct
+#define PORT_CACHEMGRXBOX_MOUNTASYNC 0x827d7b38      // CacheMgrXbox::MountAsync
 // instance addresses
 #define PORT_MODIFIERMGR_POINTER 0x82dfec08 // pointer to ModifierManager
 #define PORT_ROCKCENTRALGATEWAY 0x82cc8f60  // address of RockCentralGateway

include/rb3/Cache.h

@@ -0,0 +1,20 @@
+
+#ifndef _CACHE_H
+#define _CACHE_H
+
+typedef struct _Cache
+{
+    void *vtable;
+    int mOpCur;
+    int mLastResult;
+} Cache;
+
+typedef struct _CacheMgr
+{
+    void *vtable;
+    int mCacheIDStore[3]; // vector
+    int mOpCur;
+    int mLastResult;
+} CacheMgr;
+
+#endif // _CACHE_H

include/rb3/XboxCache.h

@@ -0,0 +1,35 @@
+
+#ifndef _XBOXCACHE_H
+#define _XBOXCACHE_H
+#ifdef RB3E_XBOX
+
+#include <xtl.h>
+#include "rb3/Cache.h"
+#include "rb3/String.h"
+#include "rb3/Symbol.h"
+
+typedef struct _CacheIDXbox
+{
+    void *vtable;
+    String mStrCacheName;
+    XCONTENT_DATA mContentData;
+} CacheIDXbox;
+
+typedef struct _CacheMgrXbox
+{
+    CacheMgr root;
+    int mEnumerationHandle;
+    XOVERLAPPED mOverlapped;
+    CacheIDXbox **mOutCacheIDPtr;
+    void *mPendingCachePtr;
+    void *mPendingObject;
+    CacheIDXbox *mPendingCacheID;
+    XCONTENT_DATA mContentData;
+    String mCacheSearchName;
+    String unk;
+} CacheMgrXbox;
+
+int CacheMgrXbox_MountAsync(CacheMgrXbox *thisCacheMgr, CacheIDXbox *cacheID, Cache **outCache, void *object);
+
+#endif // RB3E_XBOX
+#endif // _XBOXCACHE_H

include/rb3/XboxContent.h

@@ -0,0 +1,41 @@
+
+#ifndef _XBOXCONTENT_H
+#define _XBOXCONTENT_H
+#ifdef RB3E_XBOX
+
+#include <xtl.h>
+#include "rb3/String.h"
+#include "rb3/Symbol.h"
+
+typedef enum _ContentState
+{
+    kUnmounted = 0,
+    kNeedsMounting = 1,
+    kMounting = 2,
+    kUnmounting = 3,
+    kMounted = 4,
+    kDeleting = 6,
+    kDeleted = 7,
+    kFailed = 8,
+} ContentState;
+
+typedef struct _XboxContent
+{
+    void *vtable;
+    XOVERLAPPED *mOverlapped;
+    XCONTENT_CROSS_TITLE_DATA mTitleData;
+    int mLicenseBits;
+    char mLicenseBitsValid; // bool
+    String mRoot;
+    String mMountPath;
+    int mState;
+    int mPadNum;
+    char mDeleted; // bool
+    Symbol mFileName;
+    int mLRM; // what?
+} XboxContent;
+
+XboxContent *XboxContentConstruct(XboxContent *thisXboxContent, XCONTENT_CROSS_TITLE_DATA *titleData, int contentIndex, int padNum, char needsMount);
+
+#endif // RB3E_XBOX
+#endif // _XBOXCONTENT_H

include/rb3enhanced.h

@@ -29,6 +29,7 @@ int RB3E_CreateThread(void *address, void *arg, int stack_size);
 void RB3E_Sleep(int ms);
 int RB3E_RelaunchGame();
 void RB3E_FlushCache(void * address, unsigned int size);
+int RB3E_DeleteSongCache();
 
 // stub function at the start of the .text segment - doubles as the start of _functions.c
 void RB3EBase();

include/xbox360.h

@@ -53,4 +53,5 @@ void XNetLogonGetExtendedStatus(unsigned int *login_status, unsigned int *login_
 void InitCryptoHooks();
 void InitLivelessHooks();
 void InitInputHooks();
+void InitContentHooks();
 #endif // RB3E_XBOX

source/DTAFunctions.c

@@ -287,6 +287,13 @@ DataNode *DTAGetOrigin(DataNode *node, DataArray *args)
     return node;
 }
 
+DataNode *DTADeleteSongCache(DataNode *node, DataArray *args)
+{
+    node->type = INT_VALUE;
+    node->value.intVal = RB3E_DeleteSongCache();
+    return node;
+}
+
 #ifdef RB3E_XBOX
 // this function is inlined on the Xbox version, so we re-create it
 void DataRegisterFunc(Symbol name, DTAFunction_t func)
@@ -312,5 +319,6 @@ void AddDTAFunctions()
     DataRegisterFunc(globalSymbols.rb3e_get_album, DTAGetAlbum);
     DataRegisterFunc(globalSymbols.rb3e_get_origin, DTAGetOrigin);
     DataRegisterFunc(globalSymbols.rb3e_get_genre, DTAGetGenre);
+    DataRegisterFunc(globalSymbols.rb3e_delete_songcache, DTADeleteSongCache);
     RB3E_MSG("Added DTA functions!", NULL);
 }

source/GlobalSymbols.c

@@ -41,6 +41,7 @@ void InitGlobalSymbols()
     SymbolConstruct(&globalSymbols.rb3e_get_album, "rb3e_get_album");
     SymbolConstruct(&globalSymbols.rb3e_get_origin, "rb3e_get_origin");
     SymbolConstruct(&globalSymbols.rb3e_get_genre, "rb3e_get_genre");
+    SymbolConstruct(&globalSymbols.rb3e_delete_songcache, "rb3e_delete_songcache");
 
     SymbolConstruct(&globalSymbols.blackBackground, "mod_black_background");
     SymbolConstruct(&globalSymbols.colorShuffle, "mod_color_shuffle");