/[svn]/linuxsampler/trunk/src/network/lscpserver.cpp
ViewVC logotype

Diff of /linuxsampler/trunk/src/network/lscpserver.cpp

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1403 by iliev, Fri Oct 12 09:12:22 2007 UTC revision 1649 by nagata, Fri Jan 25 15:06:02 2008 UTC
# Line 25  Line 25 
25  #include "lscpresultset.h"  #include "lscpresultset.h"
26  #include "lscpevent.h"  #include "lscpevent.h"
27    
28    #if defined(WIN32)
29    #include <windows.h>
30    #else
31  #include <fcntl.h>  #include <fcntl.h>
32    #endif
33    
34  #if ! HAVE_SQLITE3  #if ! HAVE_SQLITE3
35  #define DOESNT_HAVE_SQLITE3 "No database support. SQLITE3 was not installed when linuxsampler was built."  #define DOESNT_HAVE_SQLITE3 "No database support. SQLITE3 was not installed when linuxsampler was built."
# Line 123  LSCPServer::LSCPServer(Sampler* pSampler Line 127  LSCPServer::LSCPServer(Sampler* pSampler
127      LSCPEvent::RegisterEvent(LSCPEvent::event_db_instr_info, "DB_INSTRUMENT_INFO");      LSCPEvent::RegisterEvent(LSCPEvent::event_db_instr_info, "DB_INSTRUMENT_INFO");
128      LSCPEvent::RegisterEvent(LSCPEvent::event_db_instrs_job_info, "DB_INSTRUMENTS_JOB_INFO");      LSCPEvent::RegisterEvent(LSCPEvent::event_db_instrs_job_info, "DB_INSTRUMENTS_JOB_INFO");
129      LSCPEvent::RegisterEvent(LSCPEvent::event_misc, "MISCELLANEOUS");      LSCPEvent::RegisterEvent(LSCPEvent::event_misc, "MISCELLANEOUS");
130        LSCPEvent::RegisterEvent(LSCPEvent::event_total_stream_count, "TOTAL_STREAM_COUNT");
131      LSCPEvent::RegisterEvent(LSCPEvent::event_total_voice_count, "TOTAL_VOICE_COUNT");      LSCPEvent::RegisterEvent(LSCPEvent::event_total_voice_count, "TOTAL_VOICE_COUNT");
132      LSCPEvent::RegisterEvent(LSCPEvent::event_global_info, "GLOBAL_INFO");      LSCPEvent::RegisterEvent(LSCPEvent::event_global_info, "GLOBAL_INFO");
133      hSocket = -1;      hSocket = -1;
134  }  }
135    
136  LSCPServer::~LSCPServer() {  LSCPServer::~LSCPServer() {
137    #if defined(WIN32)
138        if (hSocket >= 0) closesocket(hSocket);
139    #else
140      if (hSocket >= 0) close(hSocket);      if (hSocket >= 0) close(hSocket);
141    #endif
142  }  }
143    
144  void LSCPServer::EventHandler::ChannelCountChanged(int NewCount) {  void LSCPServer::EventHandler::ChannelCountChanged(int NewCount) {
# Line 180  void LSCPServer::EventHandler::TotalVoic Line 189  void LSCPServer::EventHandler::TotalVoic
189      LSCPServer::SendLSCPNotify(LSCPEvent(LSCPEvent::event_total_voice_count, NewCount));      LSCPServer::SendLSCPNotify(LSCPEvent(LSCPEvent::event_total_voice_count, NewCount));
190  }  }
191    
192    void LSCPServer::EventHandler::TotalStreamCountChanged(int NewCount) {
193        LSCPServer::SendLSCPNotify(LSCPEvent(LSCPEvent::event_total_stream_count, NewCount));
194    }
195    
196  #if HAVE_SQLITE3  #if HAVE_SQLITE3
197  void LSCPServer::DbInstrumentsEventHandler::DirectoryCountChanged(String Dir) {  void LSCPServer::DbInstrumentsEventHandler::DirectoryCountChanged(String Dir) {
198      LSCPServer::SendLSCPNotify(LSCPEvent(LSCPEvent::event_db_instr_dir_count, InstrumentsDb::toEscapedPath(Dir)));      LSCPServer::SendLSCPNotify(LSCPEvent(LSCPEvent::event_db_instr_dir_count, InstrumentsDb::toEscapedPath(Dir)));
# Line 230  int LSCPServer::WaitUntilInitialized(lon Line 243  int LSCPServer::WaitUntilInitialized(lon
243  }  }
244    
245  int LSCPServer::Main() {  int LSCPServer::Main() {
246            #if defined(WIN32)
247            WSADATA wsaData;
248            int iResult;
249            iResult = WSAStartup(MAKEWORD(2,2), &wsaData);
250            if (iResult != 0) {
251                    std::cerr << "LSCPServer: WSAStartup failed: " << iResult << "\n";
252                    exit(EXIT_FAILURE);
253            }
254            #endif
255      hSocket = socket(AF_INET, SOCK_STREAM, 0);      hSocket = socket(AF_INET, SOCK_STREAM, 0);
256      if (hSocket < 0) {      if (hSocket < 0) {
257          std::cerr << "LSCPServer: Could not create server socket." << std::endl;          std::cerr << "LSCPServer: Could not create server socket." << std::endl;
# Line 243  int LSCPServer::Main() { Line 265  int LSCPServer::Main() {
265              if (bind(hSocket, (sockaddr*) &SocketAddress, sizeof(sockaddr_in)) < 0) {              if (bind(hSocket, (sockaddr*) &SocketAddress, sizeof(sockaddr_in)) < 0) {
266                  if (trial > LSCP_SERVER_BIND_TIMEOUT) {                  if (trial > LSCP_SERVER_BIND_TIMEOUT) {
267                      std::cerr << "gave up!" << std::endl;                      std::cerr << "gave up!" << std::endl;
268                        #if defined(WIN32)
269                        closesocket(hSocket);
270                        #else
271                      close(hSocket);                      close(hSocket);
272                        #endif
273                      //return -1;                      //return -1;
274                      exit(EXIT_FAILURE);                      exit(EXIT_FAILURE);
275                  }                  }
# Line 263  int LSCPServer::Main() { Line 289  int LSCPServer::Main() {
289      pSampler->AddVoiceCountListener(&eventHandler);      pSampler->AddVoiceCountListener(&eventHandler);
290      pSampler->AddStreamCountListener(&eventHandler);      pSampler->AddStreamCountListener(&eventHandler);
291      pSampler->AddBufferFillListener(&eventHandler);      pSampler->AddBufferFillListener(&eventHandler);
292        pSampler->AddTotalStreamCountListener(&eventHandler);
293      pSampler->AddTotalVoiceCountListener(&eventHandler);      pSampler->AddTotalVoiceCountListener(&eventHandler);
294      pSampler->AddFxSendCountListener(&eventHandler);      pSampler->AddFxSendCountListener(&eventHandler);
295      MidiInstrumentMapper::AddMidiInstrumentCountListener(&eventHandler);      MidiInstrumentMapper::AddMidiInstrumentCountListener(&eventHandler);
# Line 282  int LSCPServer::Main() { Line 309  int LSCPServer::Main() {
309      timeval timeout;      timeval timeout;
310    
311      while (true) {      while (true) {
312            #if CONFIG_PTHREAD_TESTCANCEL
313                    TestCancel();
314            #endif
315          // check if some engine channel's parameter / status changed, if so notify the respective LSCP event subscribers          // check if some engine channel's parameter / status changed, if so notify the respective LSCP event subscribers
316          {          {
317              std::set<EngineChannel*> engineChannels = EngineChannelFactory::EngineChannelInstances();              std::set<EngineChannel*> engineChannels = EngineChannelFactory::EngineChannelInstances();
# Line 325  int LSCPServer::Main() { Line 355  int LSCPServer::Main() {
355                  continue; //Nothing try again                  continue; //Nothing try again
356          if (retval == -1) {          if (retval == -1) {
357                  std::cerr << "LSCPServer: Socket select error." << std::endl;                  std::cerr << "LSCPServer: Socket select error." << std::endl;
358                    #if defined(WIN32)
359                    closesocket(hSocket);
360                    #else
361                  close(hSocket);                  close(hSocket);
362                    #endif
363                  exit(EXIT_FAILURE);                  exit(EXIT_FAILURE);
364          }          }
365    
# Line 337  int LSCPServer::Main() { Line 371  int LSCPServer::Main() {
371                          exit(EXIT_FAILURE);                          exit(EXIT_FAILURE);
372                  }                  }
373    
374                    #if defined(WIN32)
375                    u_long nonblock_io = 1;
376                    if( ioctlsocket(socket, FIONBIO, &nonblock_io) ) {
377                      std::cerr << "LSCPServer: ioctlsocket: set FIONBIO failed. Error " << WSAGetLastError() << std::endl;
378                      exit(EXIT_FAILURE);
379                    }
380            #else
381                  if (fcntl(socket, F_SETFL, O_NONBLOCK)) {                  if (fcntl(socket, F_SETFL, O_NONBLOCK)) {
382                          std::cerr << "LSCPServer: F_SETFL O_NONBLOCK failed." << std::endl;                          std::cerr << "LSCPServer: F_SETFL O_NONBLOCK failed." << std::endl;
383                          exit(EXIT_FAILURE);                          exit(EXIT_FAILURE);
384                  }                  }
385                    #endif
386    
387                  // Parser initialization                  // Parser initialization
388                  yyparse_param_t yyparse_param;                  yyparse_param_t yyparse_param;
# Line 399  void LSCPServer::CloseConnection( std::v Line 441  void LSCPServer::CloseConnection( std::v
441          NotifyMutex.Lock();          NotifyMutex.Lock();
442          bufferedCommands.erase(socket);          bufferedCommands.erase(socket);
443          bufferedNotifies.erase(socket);          bufferedNotifies.erase(socket);
444            #if defined(WIN32)
445            closesocket(socket);
446            #else
447          close(socket);          close(socket);
448            #endif
449          NotifyMutex.Unlock();          NotifyMutex.Unlock();
450  }  }
451    
452    void LSCPServer::LockRTNotify() {
453        RTNotifyMutex.Lock();
454    }
455    
456    void LSCPServer::UnlockRTNotify() {
457        RTNotifyMutex.Unlock();
458    }
459    
460  int LSCPServer::EventSubscribers( std::list<LSCPEvent::event_t> events ) {  int LSCPServer::EventSubscribers( std::list<LSCPEvent::event_t> events ) {
461          int subs = 0;          int subs = 0;
462          SubscriptionMutex.Lock();          SubscriptionMutex.Lock();
# Line 478  bool LSCPServer::GetLSCPCommand( std::ve Line 532  bool LSCPServer::GetLSCPCommand( std::ve
532          char c;          char c;
533          int i = 0;          int i = 0;
534          while (true) {          while (true) {
535                    #if defined(WIN32)
536                    int result = recv(socket, (char *)&c, 1, 0); //Read one character at a time for now
537                    #else
538                  int result = recv(socket, (void *)&c, 1, 0); //Read one character at a time for now                  int result = recv(socket, (void *)&c, 1, 0); //Read one character at a time for now
539                    #endif
540                  if (result == 0) { //socket was selected, so 0 here means client has closed the connection                  if (result == 0) { //socket was selected, so 0 here means client has closed the connection
541                          CloseConnection(iter);                          CloseConnection(iter);
542                          break;                          break;
# Line 493  bool LSCPServer::GetLSCPCommand( std::ve Line 551  bool LSCPServer::GetLSCPCommand( std::ve
551                          }                          }
552                          bufferedCommands[socket] += c;                          bufferedCommands[socket] += c;
553                  }                  }
554                    #if defined(WIN32)
555                    if (result == SOCKET_ERROR) {
556                        int wsa_lasterror = WSAGetLastError();
557                            if (wsa_lasterror == WSAEWOULDBLOCK) //Would block, try again later.
558                                    return false;
559                            dmsg(2,("LSCPScanner: Socket error after recv() Error %d.\n", wsa_lasterror));
560                            CloseConnection(iter);
561                            break;
562                    }
563                    #else
564                  if (result == -1) {                  if (result == -1) {
565                          if (errno == EAGAIN) //Would block, try again later.                          if (errno == EAGAIN) //Would block, try again later.
566                                  return false;                                  return false;
# Line 531  bool LSCPServer::GetLSCPCommand( std::ve Line 599  bool LSCPServer::GetLSCPCommand( std::ve
599                          CloseConnection(iter);                          CloseConnection(iter);
600                          break;                          break;
601                  }                  }
602                    #endif
603          }          }
604          return false;          return false;
605  }  }
# Line 877  String LSCPServer::GetChannelInfo(uint u Line 946  String LSCPServer::GetChannelInfo(uint u
946          if (pSamplerChannel->GetMidiInputChannel() == midi_chan_all) result.Add("MIDI_INPUT_CHANNEL", "ALL");          if (pSamplerChannel->GetMidiInputChannel() == midi_chan_all) result.Add("MIDI_INPUT_CHANNEL", "ALL");
947          else result.Add("MIDI_INPUT_CHANNEL", pSamplerChannel->GetMidiInputChannel());          else result.Add("MIDI_INPUT_CHANNEL", pSamplerChannel->GetMidiInputChannel());
948    
949          result.Add("INSTRUMENT_FILE",          // convert the filename into the correct encoding as defined for LSCP
950                     (InstrumentFileName != "NONE" && InstrumentFileName != "") ?          // (especially in terms of special characters -> escape sequences)
951                          Path::fromPosix(InstrumentFileName).toLscp() : // TODO: assuming POSIX          if (InstrumentFileName != "NONE" && InstrumentFileName != "") {
952                          InstrumentFileName  #if WIN32
953          );              InstrumentFileName = Path::fromWindows(InstrumentFileName).toLscp();
954    #else
955                // assuming POSIX
956                InstrumentFileName = Path::fromPosix(InstrumentFileName).toLscp();
957    #endif
958            }
959    
960            result.Add("INSTRUMENT_FILE", InstrumentFileName);
961          result.Add("INSTRUMENT_NR", InstrumentIndex);          result.Add("INSTRUMENT_NR", InstrumentIndex);
962          result.Add("INSTRUMENT_NAME", _escapeLscpResponse(InstrumentName));          result.Add("INSTRUMENT_NAME", _escapeLscpResponse(InstrumentName));
963          result.Add("INSTRUMENT_STATUS", InstrumentStatus);          result.Add("INSTRUMENT_STATUS", InstrumentStatus);
# Line 1825  String LSCPServer::GetMidiInstrumentMapp Line 1901  String LSCPServer::GetMidiInstrumentMapp
1901          std::map<midi_prog_index_t,MidiInstrumentMapper::entry_t>::iterator iter = mappings.find(idx);          std::map<midi_prog_index_t,MidiInstrumentMapper::entry_t>::iterator iter = mappings.find(idx);
1902          if (iter == mappings.end()) result.Error("there is no map entry with that index");          if (iter == mappings.end()) result.Error("there is no map entry with that index");
1903          else { // found          else { // found
1904    
1905                // convert the filename into the correct encoding as defined for LSCP
1906                // (especially in terms of special characters -> escape sequences)
1907    #if WIN32
1908                const String instrumentFileName = Path::fromWindows(iter->second.InstrumentFile).toLscp();
1909    #else
1910                // assuming POSIX
1911                const String instrumentFileName = Path::fromPosix(iter->second.InstrumentFile).toLscp();
1912    #endif
1913    
1914              result.Add("NAME", _escapeLscpResponse(iter->second.Name));              result.Add("NAME", _escapeLscpResponse(iter->second.Name));
1915              result.Add("ENGINE_NAME", iter->second.EngineName);              result.Add("ENGINE_NAME", iter->second.EngineName);
1916              result.Add("INSTRUMENT_FILE", Path::fromPosix(iter->second.InstrumentFile).toLscp()); //TODO: assuming POSIX              result.Add("INSTRUMENT_FILE", instrumentFileName);
1917              result.Add("INSTRUMENT_NR", (int) iter->second.InstrumentIndex);              result.Add("INSTRUMENT_NR", (int) iter->second.InstrumentIndex);
1918              String instrumentName;              String instrumentName;
1919              Engine* pEngine = EngineFactory::Create(iter->second.EngineName);              Engine* pEngine = EngineFactory::Create(iter->second.EngineName);
# Line 2278  String LSCPServer::GetServerInfo() { Line 2364  String LSCPServer::GetServerInfo() {
2364  }  }
2365    
2366  /**  /**
2367     * Will be called by the parser to return the current number of all active streams.
2368     */
2369    String LSCPServer::GetTotalStreamCount() {
2370        dmsg(2,("LSCPServer: GetTotalStreamCount()\n"));
2371        LSCPResultSet result;
2372        result.Add(pSampler->GetDiskStreamCount());
2373        return result.Produce();
2374    }
2375    
2376    /**
2377   * Will be called by the parser to return the current number of all active voices.   * Will be called by the parser to return the current number of all active voices.
2378   */   */
2379  String LSCPServer::GetTotalVoiceCount() {  String LSCPServer::GetTotalVoiceCount() {
# Line 2315  String LSCPServer::SetGlobalVolume(doubl Line 2411  String LSCPServer::SetGlobalVolume(doubl
2411      return result.Produce();      return result.Produce();
2412  }  }
2413    
2414    String LSCPServer::GetFileInstruments(String Filename) {
2415        dmsg(2,("LSCPServer: GetFileInstruments(String Filename=%s)\n",Filename.c_str()));
2416        LSCPResultSet result;
2417        try {
2418            VerifyFile(Filename);
2419        } catch (Exception e) {
2420            result.Error(e);
2421            return result.Produce();
2422        }
2423        // try to find a sampler engine that can handle the file
2424        bool bFound = false;
2425        std::vector<String> engineTypes = EngineFactory::AvailableEngineTypes();
2426        for (int i = 0; !bFound && i < engineTypes.size(); i++) {
2427            Engine* pEngine = NULL;
2428            try {
2429                pEngine = EngineFactory::Create(engineTypes[i]);
2430                if (!pEngine) throw Exception("Internal error: could not create '" + engineTypes[i] + "' engine");
2431                InstrumentManager* pManager = pEngine->GetInstrumentManager();
2432                if (pManager) {
2433                    std::vector<InstrumentManager::instrument_id_t> IDs =
2434                        pManager->GetInstrumentFileContent(Filename);
2435                    // return the amount of instruments in the file
2436                    result.Add(IDs.size());
2437                    // no more need to ask other engine types
2438                    bFound = true;
2439                } else dmsg(1,("Warning: engine '%s' does not provide an instrument manager\n", engineTypes[i].c_str()));
2440            } catch (Exception e) {
2441                // NOOP, as exception is thrown if engine doesn't support file
2442            }
2443            if (pEngine) EngineFactory::Destroy(pEngine);
2444        }
2445    
2446        if (!bFound) result.Error("Unknown file format");
2447        return result.Produce();
2448    }
2449    
2450    String LSCPServer::ListFileInstruments(String Filename) {
2451        dmsg(2,("LSCPServer: ListFileInstruments(String Filename=%s)\n",Filename.c_str()));
2452        LSCPResultSet result;
2453        try {
2454            VerifyFile(Filename);
2455        } catch (Exception e) {
2456            result.Error(e);
2457            return result.Produce();
2458        }
2459        // try to find a sampler engine that can handle the file
2460        bool bFound = false;
2461        std::vector<String> engineTypes = EngineFactory::AvailableEngineTypes();
2462        for (int i = 0; !bFound && i < engineTypes.size(); i++) {
2463            Engine* pEngine = NULL;
2464            try {
2465                pEngine = EngineFactory::Create(engineTypes[i]);
2466                if (!pEngine) throw Exception("Internal error: could not create '" + engineTypes[i] + "' engine");
2467                InstrumentManager* pManager = pEngine->GetInstrumentManager();
2468                if (pManager) {
2469                    std::vector<InstrumentManager::instrument_id_t> IDs =
2470                        pManager->GetInstrumentFileContent(Filename);
2471                    // return a list of IDs of the instruments in the file
2472                    String s;
2473                    for (int j = 0; j < IDs.size(); j++) {
2474                        if (s.size()) s += ",";
2475                        s += ToString(IDs[j].Index);
2476                    }
2477                    result.Add(s);
2478                    // no more need to ask other engine types
2479                    bFound = true;
2480                } else dmsg(1,("Warning: engine '%s' does not provide an instrument manager\n", engineTypes[i].c_str()));
2481            } catch (Exception e) {
2482                // NOOP, as exception is thrown if engine doesn't support file
2483            }
2484            if (pEngine) EngineFactory::Destroy(pEngine);
2485        }
2486    
2487        if (!bFound) result.Error("Unknown file format");
2488        return result.Produce();
2489    }
2490    
2491    String LSCPServer::GetFileInstrumentInfo(String Filename, uint InstrumentID) {
2492        dmsg(2,("LSCPServer: GetFileInstrumentInfo(String Filename=%s, InstrumentID=%d)\n",Filename.c_str(),InstrumentID));
2493        LSCPResultSet result;
2494        try {
2495            VerifyFile(Filename);
2496        } catch (Exception e) {
2497            result.Error(e);
2498            return result.Produce();
2499        }
2500        InstrumentManager::instrument_id_t id;
2501        id.FileName = Filename;
2502        id.Index    = InstrumentID;
2503        // try to find a sampler engine that can handle the file
2504        bool bFound = false;
2505        bool bFatalErr = false;
2506        std::vector<String> engineTypes = EngineFactory::AvailableEngineTypes();
2507        for (int i = 0; !bFound && !bFatalErr && i < engineTypes.size(); i++) {
2508            Engine* pEngine = NULL;
2509            try {
2510                pEngine = EngineFactory::Create(engineTypes[i]);
2511                if (!pEngine) throw Exception("Internal error: could not create '" + engineTypes[i] + "' engine");
2512                InstrumentManager* pManager = pEngine->GetInstrumentManager();
2513                if (pManager) {
2514                    // check if the instrument index is valid
2515                    // FIXME: this won't work if an engine only supports parts of the instrument file
2516                    std::vector<InstrumentManager::instrument_id_t> IDs =
2517                        pManager->GetInstrumentFileContent(Filename);
2518                    if (std::find(IDs.begin(), IDs.end(), id) == IDs.end()) {
2519                        std::stringstream ss;
2520                        ss << "Invalid instrument index " << InstrumentID << " for instrument file '" << Filename << "'";
2521                        bFatalErr = true;
2522                        throw Exception(ss.str());
2523                    }
2524                    // get the info of the requested instrument
2525                    InstrumentManager::instrument_info_t info =
2526                        pManager->GetInstrumentInfo(id);
2527                    // return detailed informations about the file
2528                    result.Add("NAME", info.InstrumentName);
2529                    result.Add("FORMAT_FAMILY", engineTypes[i]);
2530                    result.Add("FORMAT_VERSION", info.FormatVersion);
2531                    result.Add("PRODUCT", info.Product);
2532                    result.Add("ARTISTS", info.Artists);
2533                    // no more need to ask other engine types
2534                    bFound = true;
2535                } else dmsg(1,("Warning: engine '%s' does not provide an instrument manager\n", engineTypes[i].c_str()));
2536            } catch (Exception e) {
2537                // usually NOOP, as exception is thrown if engine doesn't support file
2538                if (bFatalErr) result.Error(e);
2539            }
2540            if (pEngine) EngineFactory::Destroy(pEngine);
2541        }
2542    
2543        if (!bFound && !bFatalErr) result.Error("Unknown file format");
2544        return result.Produce();
2545    }
2546    
2547    void LSCPServer::VerifyFile(String Filename) {
2548        #if WIN32
2549        WIN32_FIND_DATA win32FileAttributeData;
2550        BOOL res = GetFileAttributesEx( Filename.c_str(), GetFileExInfoStandard, &win32FileAttributeData );
2551        if (!res) {
2552            std::stringstream ss;
2553            ss << "File does not exist, GetFileAttributesEx failed `" << Filename << "`: Error " << GetLastError();
2554            throw Exception(ss.str());
2555        }
2556        if ( win32FileAttributeData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY ) {
2557            throw Exception("Directory is specified");
2558        }
2559        #else
2560        struct stat statBuf;
2561        int res = stat(Filename.c_str(), &statBuf);
2562        if (res) {
2563            std::stringstream ss;
2564            ss << "Fail to stat `" << Filename << "`: " << strerror(errno);
2565            throw Exception(ss.str());
2566        }
2567    
2568        if (S_ISDIR(statBuf.st_mode)) {
2569            throw Exception("Directory is specified");
2570        }
2571        #endif
2572    }
2573    
2574  /**  /**
2575   * Will be called by the parser to subscribe a client (frontend) on the   * Will be called by the parser to subscribe a client (frontend) on the
2576   * server for receiving event messages.   * server for receiving event messages.

Legend:
Removed from v.1403  
changed lines
  Added in v.1649

  ViewVC Help
Powered by ViewVC