Research

I looked at the code to see if I find what needed to be changed:

Here is the jump to next section implemented inside of SongView.cpp:

picoTracker/sources/Application/Views/SongView.cpp

Lines 428 to 475 in f52131e

    
           void SongView::jumpToNextSection(int direction) { 
        
             int current = viewData_->songY_ + viewData_->songOffset_; 
        
             bool foundGap = false; 
        
             for (int i = 0; i < SONG_ROW_COUNT; i++) { 
        
               unsigned char *start = viewData_->song_->data_ + viewData_->songX_ + 
        
                                      SONG_CHANNEL_COUNT * current; 
        
               if (foundGap && (*start != 0xFF)) { 
        
                 break; 
        
               } else { 
        
                 if (*start == 0xFF) { 
        
                   foundGap = true; 
        
                 } 
        
               } 
        
               current += direction; 
        
               if (current < 0) { 
        
                 current += SONG_ROW_COUNT; 
        
               } 
        
               if (current >= SONG_ROW_COUNT) { 
        
                 current -= SONG_ROW_COUNT; 
        
               } 
        
             } 
        
             // If we go backwards, we stil have to go to the beginning of the block 
        
             if (direction < 0) { 
        
               while (current > 0) { 
        
                 unsigned char *start = viewData_->song_->data_ + viewData_->songX_ + 
        
                                        SONG_CHANNEL_COUNT * current; 
        
                 if (*start == 0xFF) { 
        
                   current++; 
        
                   break; 
        
                 }; 
        
                 current--; 
        
               }; 
        
             } 
        
             // Update viewdata position from current 
        
             if ((current - viewData_->songOffset_ > 0x17) || 
        
                 (current - viewData_->songOffset_ < 0)) { 
        
               viewData_->songOffset_ = current - 4; 
        
               if (viewData_->songOffset_ < 0) { 
        
                 viewData_->songOffset_ = 0; 
        
               } 
        
             } 
        
             viewData_->songY_ = current - viewData_->songOffset_; 
        
             isDirty_ = true; 
        
           }

and here is the function called by button presses:

picoTracker/sources/Application/Views/SongView.cpp

Lines 648 to 654 in f52131e

    
           if (mask & EPBM_ALT) { 
        
             if (mask & EPBM_DOWN) { 
        
               jumpToNextSection(1); 
        
             } 
        
             if (mask & EPBM_UP) { 
        
               jumpToNextSection(-1); 
        
             }

The Phrase screen just doesn't have such implementation.

Possible Approach

Not sure, if this contradicts any architectural design choices, but one possible solution could be:

move jumpToNextSection from SongView into the ViewData class as a public method.
add "keybindings" to every view (where applicable), and use ViewData::jumpatoNextSection there

see ViewData:

picoTracker/sources/Application/Views/ViewData.h

Lines 10 to 27 in f52131e

    
           class ViewData { 
        
           public: 
        
             ViewData(Project *project); 
        
             ~ViewData(); 
        
             unsigned char UpdateSongChain(int offset); 
        
             void UpdateSongOffset(int offset); 
        
             void UpdateSongCursor(int dx, int dy); 
        
             void SetSongChain(unsigned char); 
        
             unsigned char *GetCurrentSongPointer(); 
        
             void UpdateChainCursor(int dx, int dy); 
        
             unsigned char UpdateChainCursorValue(int offset, int dx, int dy); 
        
             void SetChainPhrase(unsigned char value); 
        
             unsigned char *GetCurrentChainPointer(); 
        
           protected:

Is this a valid approach? Should it be implemented differently?

	void SongView::jumpToNextSection(int direction) {

	int current = viewData_->songY_ + viewData_->songOffset_;
	bool foundGap = false;
	for (int i = 0; i < SONG_ROW_COUNT; i++) {
	unsigned char *start = viewData_->song_->data_ + viewData_->songX_ +
	SONG_CHANNEL_COUNT * current;
	if (foundGap && (*start != 0xFF)) {
	break;
	} else {
	if (*start == 0xFF) {
	foundGap = true;
	}
	}
	current += direction;
	if (current < 0) {
	current += SONG_ROW_COUNT;
	}
	if (current >= SONG_ROW_COUNT) {
	current -= SONG_ROW_COUNT;
	}
	}
	// If we go backwards, we stil have to go to the beginning of the block

	if (direction < 0) {
	while (current > 0) {
	unsigned char *start = viewData_->song_->data_ + viewData_->songX_ +
	SONG_CHANNEL_COUNT * current;
	if (*start == 0xFF) {
	current++;
	break;
	};
	current--;
	};
	}

	// Update viewdata position from current

	if ((current - viewData_->songOffset_ > 0x17) \|\|
	(current - viewData_->songOffset_ < 0)) {
	viewData_->songOffset_ = current - 4;
	if (viewData_->songOffset_ < 0) {
	viewData_->songOffset_ = 0;
	}
	}
	viewData_->songY_ = current - viewData_->songOffset_;
	isDirty_ = true;
	}

	if (mask & EPBM_ALT) {
	if (mask & EPBM_DOWN) {
	jumpToNextSection(1);
	}
	if (mask & EPBM_UP) {
	jumpToNextSection(-1);
	}

	class ViewData {

	public:
	ViewData(Project *project);
	~ViewData();

	unsigned char UpdateSongChain(int offset);
	void UpdateSongOffset(int offset);
	void UpdateSongCursor(int dx, int dy);
	void SetSongChain(unsigned char);
	unsigned char *GetCurrentSongPointer();

	void UpdateChainCursor(int dx, int dy);
	unsigned char UpdateChainCursorValue(int offset, int dx, int dy);
	void SetChainPhrase(unsigned char value);
	unsigned char *GetCurrentChainPointer();

	protected:

make alt + up/down work on all screens #562

Description

Metadata

Metadata

Assignees

Labels

Type

Projects

Milestone

Relationships

Development

Issue actions