Changeset 4811:8d0d713ca0c1 in roaraudio for roard/roard.c

Timestamp:

03/27/11 13:38:18 (13 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

Removed old -d and friends from roard (Closes: #122)

File:

• roard/roard.c (modified) (7 diffs)

roard/roard.c

@@ -1693 +1693 @@
  int    realtime     = 0;
  int    sysclocksync = 0;
- char * driver    = NULL;
- char * device    = NULL;
-#ifdef ROAR_HAVE_MAIN_ARGS
- char * opts      = NULL;
-#endif
 // char * server = ROAR_DEFAULT_SOCK_GLOBAL;
 #ifdef ROAR_SUPPORT_LISTEN
@@ -1706 +1701 @@
  struct roar_audio_info sock_info = {0, 0, 0, 0};
 #endif
- int               drvid;
 #ifndef ROAR_WITHOUT_DCOMP_SOURCES
  char * s_drv     = "cf";
@@ -1763 +1757 @@
  struct servent * serv = NULL;
 #endif
- DRIVER_USERDATA_T drvinst;
  struct roar_client * self = NULL;
 #ifdef ROAR_HAVE_LIBDNET
@@ -2068 +2061 @@
    }
 
-  } else if ( strcmp(k, "-d") == 0 || strcmp(k, "--driver") == 0 ) {
-   _CKHAVEARGS(1);
-   driver = argv[++i];
-   if ( strcmp(driver, "list") == 0 ) {
-    ROAR_WARN("The option is obsolete, use --list-driver!");
-    print_driverlist();
-    return 0;
-   }
-  } else if ( strcmp(k, "-D") == 0 || strcmp(k, "--device") == 0 ) {
-   _CKHAVEARGS(1);
-   device = argv[++i];
-  } else if ( strcmp(k, "-dO") == 0 ) {
-   _CKHAVEARGS(1);
-   opts = argv[++i];
   } else if ( strcmp(k, "--list-driver") == 0 ) {
    print_driverlist();
@@ -2669 +2648 @@
  }
 
- if ( driver == NULL ) {
-  driver = "null";
- } else {
-  ROAR_ERR("Usage of old driver interface. use -o not -d!");
-  ROAR_WARN("-d will be removed within the next releases");
- }
-
- if ( driver_open(&drvinst, &drvid, driver, device, &sa) == -1 ) {
-  ROAR_ERR("Can not open output driver!");
-  return 1;
- }
-
  if ( samples_init() == -1 ) {
   ROAR_ERR("Can not init samples!");
@@ -2885 +2852 @@
  // start main loop...
  ROAR_INFO("Entering main loop", ROAR_DBG_INFO_INFO);
- main_loop(drvid, drvinst, &sa, sysclocksync);
+ main_loop(&sa, sysclocksync);
  ROAR_INFO("Left main loop", ROAR_DBG_INFO_INFO);
 
  // clean up.
  clean_quit_prep();
- driver_close(drvinst, drvid);
  output_buffer_free();
 
@@ -2978 +2944 @@
 
  clean_quit_prep();
-// driver_close(drvinst, drvid);
 // output_buffer_free();