[Lmuse-cvs-traffic] muse/muse/driver jack.cpp,1.44,1.45

[werner s. <wsc...@us...>]

Update of /cvsroot/lmuse/muse/muse/driver
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16761/muse/driver

Modified Files:
	jack.cpp 
Log Message:
routing fixes


Index: jack.cpp
===================================================================
RCS file: /cvsroot/lmuse/muse/muse/driver/jack.cpp,v
retrieving revision 1.44
retrieving revision 1.45
diff -C2 -d -r1.44 -r1.45
*** jack.cpp	4 Nov 2005 12:03:35 -0000	1.44
--- jack.cpp	18 Nov 2005 16:51:14 -0000	1.45
***************
*** 276,279 ****
--- 276,280 ----
  void JackAudio::graphChanged()
        {
+ // printf("JackAudio::graphChanged\n");
        InputList* il = song->inputs();
        for (iAudioInput ii = il->begin(); ii != il->end(); ++ii) {
***************
*** 299,305 ****
--- 300,308 ----
                                QString name = irl->name();
                                const char* portName = name.toLatin1().data();
+ // printf("check route <%s>\n", portName);
                                bool found = false;
                                const char** pn = ports;
                                while (pn && *pn) {
+ // printf("  <%s>\n", *pn);
                                      if (strcmp(*pn, portName) == 0) {
                                            found = true;
***************
*** 309,312 ****
--- 312,316 ----
                                      }
                                if (!found) {
+ // printf("route not found: remove Route! <%s>\n", portName);
                                      audio->msgRemoveRoute1(
                                         Route(portName, channel, Route::AUDIOPORT),
***************
*** 494,504 ****
        const char* sn = jack_port_name((jack_port_t*) src);
        const char* dn = jack_port_name((jack_port_t*) dst);
        if (sn == 0 || dn == 0) {
              fprintf(stderr, "JackAudio::connect: unknown jack ports\n");
              return false;
              }
!       if (jack_connect(client, sn, dn)) {
!             fprintf(stderr, "jack connect <%s>%p - <%s>%p failed\n",
!                sn, src, dn, dst);
              return false;
              }
--- 498,514 ----
        const char* sn = jack_port_name((jack_port_t*) src);
        const char* dn = jack_port_name((jack_port_t*) dst);
+ 
+ // printf("jack connect <%s>%p - <%s>%p\n", sn, src, dn, dst);
+ 
        if (sn == 0 || dn == 0) {
              fprintf(stderr, "JackAudio::connect: unknown jack ports\n");
              return false;
              }
!       int rv = jack_connect(client, sn, dn);
!       if (rv) {
!             fprintf(stderr, "%d: jack connect <%s>%p - <%s>%p failed\n",
!                rv, sn, src, dn, dst);
!             if (rv == EEXIST)
!                   fprintf(stderr, "  connection already made\n");
              return false;
              }
***************
*** 514,517 ****
--- 524,530 ----
        const char* sn = jack_port_name((jack_port_t*) src);
        const char* dn = jack_port_name((jack_port_t*) dst);
+ 
+ // printf("jack disconnect <%s>%p - <%s>%p\n", sn, src, dn, dst);
+ 
        if (sn == 0 || dn == 0) {
              fprintf(stderr, "JackAudio::disconnect: unknown jack ports\n");