Merge pull request #77 from narayanx/feature/save-parent-position
Save parent position in folder
This commit is contained in:
@@ -15,8 +15,13 @@
|
||||
/* Default folder */
|
||||
#define DEFAULT_DIR "sdmc:/"
|
||||
|
||||
/* Maximum number of lines that can be displayed */
|
||||
/* Maximum number of lines that can be displayed on bottom screen */
|
||||
#define MAX_LIST 28
|
||||
/* Arbitrary cap for number of stored parent positions in folder to avoid
|
||||
* unbounded memory consumption. If directories are added exceeding this,
|
||||
* dequeues path closest to root to make space.
|
||||
*/
|
||||
#define MAX_DIRECTORIES 20
|
||||
|
||||
struct watchdogInfo
|
||||
{
|
||||
|
||||
@@ -22,7 +22,7 @@ char* ctrmus_strerror(int err)
|
||||
break;
|
||||
|
||||
case DECODER_INIT_FAIL:
|
||||
error = "Unable to initialised decoder";
|
||||
error = "Unable to initialise decoder";
|
||||
break;
|
||||
|
||||
case FILE_NOT_SUPPORTED:
|
||||
|
||||
@@ -325,6 +325,11 @@ int main(int argc, char **argv)
|
||||
|
||||
playbackInfo.errInfo = &errInfo;
|
||||
|
||||
/* position of parent folder in parent directory */
|
||||
int prevPosition[MAX_DIRECTORIES] = {0};
|
||||
int prevFrom[MAX_DIRECTORIES] = {0};
|
||||
int oldFileNum, oldFrom;
|
||||
|
||||
chdir(DEFAULT_DIR);
|
||||
chdir("MUSIC");
|
||||
|
||||
@@ -507,8 +512,15 @@ int main(int argc, char **argv)
|
||||
consoleClear();
|
||||
fileMax = getDir(&dirList);
|
||||
|
||||
fileNum = 0;
|
||||
from = 0;
|
||||
fileNum = prevPosition[0];
|
||||
from = prevFrom[0];
|
||||
for (int i=0; i<MAX_DIRECTORIES-1; i++) {
|
||||
prevPosition[i] = prevPosition[i+1];
|
||||
prevFrom[i] = prevFrom[i+1];
|
||||
}
|
||||
/* default to first entry */
|
||||
prevPosition[MAX_DIRECTORIES-1] = 0;
|
||||
prevFrom[MAX_DIRECTORIES-1] = 0;
|
||||
|
||||
if(listDir(from, MAX_LIST, fileNum, dirList) < 0)
|
||||
err_print("Unable to list directory.");
|
||||
@@ -523,11 +535,26 @@ int main(int argc, char **argv)
|
||||
chdir(dirList.directories[fileNum - 1]);
|
||||
consoleClear();
|
||||
fileMax = getDir(&dirList);
|
||||
|
||||
oldFileNum = fileNum;
|
||||
oldFrom = from;
|
||||
fileNum = 0;
|
||||
from = 0;
|
||||
|
||||
if(listDir(from, MAX_LIST, fileNum, dirList) < 0)
|
||||
{
|
||||
err_print("Unable to list directory.");
|
||||
}
|
||||
else
|
||||
{
|
||||
/* save old position in folder */
|
||||
for (int i=MAX_DIRECTORIES-1; i>0; i--) {
|
||||
prevPosition[i] = prevPosition[i-1];
|
||||
prevFrom[i] = prevFrom[i-1];
|
||||
}
|
||||
prevPosition[0] = oldFileNum;
|
||||
prevFrom[0] = oldFrom;
|
||||
}
|
||||
continue;
|
||||
}
|
||||
|
||||
@@ -661,4 +688,3 @@ err:
|
||||
|
||||
goto out;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user