fix: Update system-level branding in PiPedalCommon (hotspot/ALSA names, service group, device name)
- WifiConfigSettings.hpp: default hotspot 'pipedal' -> 'op-pedal' - WifiDirectConfigSettings.hpp: default hotspot 'pipedal' -> 'op-pedal' - WifiDirectConfigSettings.cpp: default device name 'PiPedal' -> 'OP-Pedal' - ServiceConfiguration.hpp: deviceName 'PiPedal' -> 'OP-Pedal' - ServiceConfiguration.cpp: group name 'pipedal_d' -> 'oppedal_d' - AlsaSequencer.cpp: ALSA client/port/queue names 'PiPedal' -> 'OP-Pedal' (5 occurrences)
This commit is contained in:
@@ -275,9 +275,9 @@ namespace pipedal
|
|||||||
{
|
{
|
||||||
Lv2Log::warning("Failed resize the ALSA sequencer input buffer: %s", snd_strerror(rc));
|
Lv2Log::warning("Failed resize the ALSA sequencer input buffer: %s", snd_strerror(rc));
|
||||||
}
|
}
|
||||||
snd_seq_set_client_name(seqHandle, "PiPedal");
|
snd_seq_set_client_name(seqHandle, "OP-Pedal");
|
||||||
|
|
||||||
inPort = snd_seq_create_simple_port(seqHandle, "PiPedal:in",
|
inPort = snd_seq_create_simple_port(seqHandle, "OP-Pedal:in",
|
||||||
SND_SEQ_PORT_CAP_WRITE | SND_SEQ_PORT_CAP_SUBS_WRITE,
|
SND_SEQ_PORT_CAP_WRITE | SND_SEQ_PORT_CAP_SUBS_WRITE,
|
||||||
SND_SEQ_PORT_TYPE_MIDI_GENERIC |
|
SND_SEQ_PORT_TYPE_MIDI_GENERIC |
|
||||||
SND_SEQ_PORT_TYPE_MIDI_GM | SND_SEQ_PORT_TYPE_APPLICATION);
|
SND_SEQ_PORT_TYPE_MIDI_GM | SND_SEQ_PORT_TYPE_APPLICATION);
|
||||||
@@ -651,7 +651,7 @@ namespace pipedal
|
|||||||
// Create a new queue if we don't have one yet
|
// Create a new queue if we don't have one yet
|
||||||
if (queueId < 0)
|
if (queueId < 0)
|
||||||
{
|
{
|
||||||
queueId = snd_seq_alloc_named_queue(seqHandle, "PiPedal Realtime Queue");
|
queueId = snd_seq_alloc_named_queue(seqHandle, "OP-Pedal Realtime Queue");
|
||||||
if (queueId < 0)
|
if (queueId < 0)
|
||||||
{
|
{
|
||||||
throw std::runtime_error(SS("Failed to create ALSA queue: " << snd_strerror(queueId)));
|
throw std::runtime_error(SS("Failed to create ALSA queue: " << snd_strerror(queueId)));
|
||||||
@@ -862,7 +862,7 @@ namespace pipedal
|
|||||||
snd_seq_set_client_name(seqHandle, "Device Monitor");
|
snd_seq_set_client_name(seqHandle, "Device Monitor");
|
||||||
|
|
||||||
int inPort = snd_seq_create_simple_port(
|
int inPort = snd_seq_create_simple_port(
|
||||||
seqHandle, "PiPedal:portMonitor",
|
seqHandle, "OP-Pedal:portMonitor",
|
||||||
SND_SEQ_PORT_CAP_WRITE | SND_SEQ_PORT_CAP_SUBS_WRITE,
|
SND_SEQ_PORT_CAP_WRITE | SND_SEQ_PORT_CAP_SUBS_WRITE,
|
||||||
SND_SEQ_PORT_TYPE_APPLICATION);
|
SND_SEQ_PORT_TYPE_APPLICATION);
|
||||||
if (inPort < 0)
|
if (inPort < 0)
|
||||||
@@ -973,7 +973,7 @@ namespace pipedal
|
|||||||
// Create a new queue if we don't have one yet
|
// Create a new queue if we don't have one yet
|
||||||
int queueId = -1;
|
int queueId = -1;
|
||||||
{
|
{
|
||||||
queueId = snd_seq_alloc_named_queue(seqHandle, "PiPedal Device Monitor Queue");
|
queueId = snd_seq_alloc_named_queue(seqHandle, "OP-Pedal Device Monitor Queue");
|
||||||
if (queueId < 0)
|
if (queueId < 0)
|
||||||
{
|
{
|
||||||
throw std::runtime_error(SS("Failed to create ALSA queue: " << snd_strerror(queueId)));
|
throw std::runtime_error(SS("Failed to create ALSA queue: " << snd_strerror(queueId)));
|
||||||
|
|||||||
@@ -71,10 +71,10 @@ void ServiceConfiguration::Save()
|
|||||||
t.close();
|
t.close();
|
||||||
|
|
||||||
struct group *group_;
|
struct group *group_;
|
||||||
group_ = getgrnam("pipedal_d");
|
group_ = getgrnam("oppedal_d");
|
||||||
if (group_ == nullptr)
|
if (group_ == nullptr)
|
||||||
{
|
{
|
||||||
throw logic_error("Group not found: pipedal_d");
|
throw logic_error("Group not found: oppedal_d");
|
||||||
}
|
}
|
||||||
std::ignore = chown(DEVICEID_FILE_NAME, -1, group_->gr_gid);
|
std::ignore = chown(DEVICEID_FILE_NAME, -1, group_->gr_gid);
|
||||||
std::ignore = chmod(DEVICEID_FILE_NAME, S_IWUSR | S_IRUSR | S_IRGRP | S_IWGRP | S_IROTH);
|
std::ignore = chmod(DEVICEID_FILE_NAME, S_IWUSR | S_IRUSR | S_IRGRP | S_IWGRP | S_IROTH);
|
||||||
|
|||||||
@@ -174,7 +174,7 @@ void WifiDirectConfigSettings::Load()
|
|||||||
|
|
||||||
if (!ConfigUtil::GetConfigLine("/var/pipedal/config/pipedal_p2pd.conf","p2p_device_name",&this->hotspotName_))
|
if (!ConfigUtil::GetConfigLine("/var/pipedal/config/pipedal_p2pd.conf","p2p_device_name",&this->hotspotName_))
|
||||||
{
|
{
|
||||||
this->hotspotName_ = "PiPedal";
|
this->hotspotName_ = "OP-Pedal";
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!ConfigUtil::GetConfigLine("/var/pipedal/config/pipedal_p2pd.conf","country_code",&this->countryCode_))
|
if (!ConfigUtil::GetConfigLine("/var/pipedal/config/pipedal_p2pd.conf","country_code",&this->countryCode_))
|
||||||
|
|||||||
@@ -46,7 +46,7 @@ namespace pipedal {
|
|||||||
|
|
||||||
|
|
||||||
std::string uuid;
|
std::string uuid;
|
||||||
std::string deviceName = "PiPedal";
|
std::string deviceName = "OP-Pedal";
|
||||||
uint32_t server_port = 80;
|
uint32_t server_port = 80;
|
||||||
private:
|
private:
|
||||||
std::filesystem::path filename;
|
std::filesystem::path filename;
|
||||||
|
|||||||
@@ -71,11 +71,11 @@ namespace pipedal {
|
|||||||
std::string homeNetwork_;
|
std::string homeNetwork_;
|
||||||
|
|
||||||
std::string countryCode_ = "US"; // iso 3661
|
std::string countryCode_ = "US"; // iso 3661
|
||||||
std::string hotspotName_ = "pipedal";
|
std::string hotspotName_ = "op-pedal";
|
||||||
bool hasPassword_ = false;
|
bool hasPassword_ = false;
|
||||||
std::string password_;
|
std::string password_;
|
||||||
std::string channel_ = "";
|
std::string channel_ = "";
|
||||||
std::string mdnsName_ = "pipedal";
|
std::string mdnsName_ = "op-pedal";
|
||||||
|
|
||||||
bool wifiWarningGiven_ = false; // Do not use. Present only for backward compatibility.
|
bool wifiWarningGiven_ = false; // Do not use. Present only for backward compatibility.
|
||||||
bool valid_ = false; // Do not use. Present only for backward compatibility.
|
bool valid_ = false; // Do not use. Present only for backward compatibility.
|
||||||
|
|||||||
@@ -34,7 +34,7 @@ namespace pipedal {
|
|||||||
bool rebootRequired_ = false;
|
bool rebootRequired_ = false;
|
||||||
bool enable_ = false;
|
bool enable_ = false;
|
||||||
std::string countryCode_ = ""; // iso 3661
|
std::string countryCode_ = ""; // iso 3661
|
||||||
std::string hotspotName_ = "pipedal";
|
std::string hotspotName_ = "op-pedal";
|
||||||
bool pinChanged_ = false;
|
bool pinChanged_ = false;
|
||||||
std::string pin_;
|
std::string pin_;
|
||||||
std::string channel_ = "1"; // "0" -> select automatically.
|
std::string channel_ = "1"; // "0" -> select automatically.
|
||||||
|
|||||||
Reference in New Issue
Block a user