Skip to content

Unify getPortName() across drivers #6

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.

Sign up for GitHub

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

Open
drewish wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Unify getPortName() across drivers #6

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 2 additions & 20 deletions RtMidi.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1423,23 +1423,13 @@ unsigned int MidiInAlsa :: getPortCount()

std::string MidiInAlsa :: getPortName( unsigned int portNumber )
{
snd_seq_client_info_t *cinfo;
snd_seq_port_info_t *pinfo;
snd_seq_client_info_alloca( &cinfo );
snd_seq_port_info_alloca( &pinfo );

std::string stringName;
AlsaMidiData *data = static_cast<AlsaMidiData *> (apiData_);
if ( portInfo( data->seq, pinfo, SND_SEQ_PORT_CAP_READ|SND_SEQ_PORT_CAP_SUBS_READ, (int) portNumber ) ) {
int cnum = snd_seq_port_info_get_client( pinfo );
snd_seq_get_any_client_info( data->seq, cnum, cinfo );
std::ostringstream os;
os << snd_seq_client_info_get_name( cinfo );
os << " "; // GO: These lines added to make sure devices are listed
os << snd_seq_port_info_get_client( pinfo ); // GO: with full portnames added to ensure individual device names
os << ":";
os << snd_seq_port_info_get_port( pinfo );
stringName = os.str();
stringName = snd_seq_port_info_get_name( pinfo );
return stringName;
}

Expand Down Expand Up @@ -1704,21 +1694,13 @@ unsigned int MidiOutAlsa :: getPortCount()

std::string MidiOutAlsa :: getPortName( unsigned int portNumber )
{
snd_seq_client_info_t *cinfo;
snd_seq_port_info_t *pinfo;
snd_seq_client_info_alloca( &cinfo );
snd_seq_port_info_alloca( &pinfo );

std::string stringName;
AlsaMidiData *data = static_cast<AlsaMidiData *> (apiData_);
if ( portInfo( data->seq, pinfo, SND_SEQ_PORT_CAP_WRITE|SND_SEQ_PORT_CAP_SUBS_WRITE, (int) portNumber ) ) {
int cnum = snd_seq_port_info_get_client(pinfo);
snd_seq_get_any_client_info( data->seq, cnum, cinfo );
std::ostringstream os;
os << snd_seq_client_info_get_name(cinfo);
os << ":";
os << snd_seq_port_info_get_port(pinfo);
stringName = os.str();
stringName = snd_seq_port_info_get_name( pinfo );
return stringName;
}

Expand Down