Changeset 5953 in orxonox.OLD for trunk/src/lib

Timestamp:

Dec 7, 2005, 1:58:39 AM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: ini_parser safer now

Location:

trunk/src/lib

Files:

• gui/gtk_gui/gui_audio.cc (modified) (3 diffs)
• parser/ini_parser/ini_parser.cc (modified) (4 diffs)
• sound/sound_engine.cc (modified) (1 diff)

trunk/src/lib/gui/gtk_gui/gui_audio.cc

@@ -42 +42 @@
     {
       CheckButton* enableSound; //!< A Ckeckbutton for enabling Sound.
+      Slider* audioChannels;    //!< A Slider for the count of audio-channels.
       Slider* musicVolume;      //!< A Slider for music volume.
       Slider* effectsVolume;    //!< A Slider for effects volume.
@@ -51 +52 @@
       enableSound->saveability();
       audioBox->fill(enableSound);
+
+      Label* audioChannelsLabel = new Label(CONFIG_NAME_AUDIO_CHANNELS);
+      audioBox->fill(audioChannelsLabel);
+      audioChannels = new Slider(CONFIG_NAME_AUDIO_CHANNELS, 0, 32);
+      audioChannels->setFlagName("channels", "c", 32);
+      audioChannels->setDescription("Sets the count of channels in the game");
+      audioChannels->saveability();
+      audioBox->fill (audioChannels);
+
+
       Label* musicVolumeLabel = new Label(CONFIG_NAME_MUSIC_VOLUME);
       audioBox->fill(musicVolumeLabel);
@@ -58 +69 @@
       musicVolume->saveability();
       audioBox->fill (musicVolume);
+
       Label* effectsVolumeLabel = new Label (CONFIG_NAME_EFFECTS_VOLUME);
       audioBox->fill (effectsVolumeLabel);

trunk/src/lib/parser/ini_parser/ini_parser.cc

@@ -125 +125 @@
   FILE*    stream;           //< The stream we use to read the file.
   int      lineCount = 0;    //< The Count of lines.
-
 
   if (this->fileName != NULL)
@@ -448 +447 @@
   {
     std::list<IniEntry>::const_iterator entry = this->getEntryIT(entryName, sectionName);
-    if (!strcmp((*entry).name, entryName))
+    if (entry != NULL &&  !strcmp((*entry).name, entryName))
       return (*entry).value;
     PRINTF(2)("Entry '%s' in section '%s' not found.\n", entryName, sectionName);
@@ -618 +617 @@
       if (!strcmp((*entry).name, entryName))
         break;
-  return entry;
+  if (entry == (*section).entries.end())
+    return NULL;
+  else
+    return entry;
 }
 
@@ -638 +640 @@
       if (!strcmp((*entry).name, entryName))
         break;
-  return entry;
+  if (entry == (*section).entries.end())
+    return NULL;
+  else
+    return entry;
 }
 

trunk/src/lib/sound/sound_engine.cc

@@ -97 +97 @@
 void SoundEngine::loadSettings(IniParser* iniParser)
 {
+  const char* channels = iniParser->getVar(CONFIG_NAME_AUDIO_CHANNELS, CONFIG_SECTION_AUDIO, "32");
+  this->maxSourceCount = atoi(channels);
   const char* musicVolume = iniParser->getVar(CONFIG_NAME_MUSIC_VOLUME, CONFIG_SECTION_AUDIO, "80");
   this->musicVolume = atof(musicVolume)/100.0;