[PD-cvs] pd/src s_main.c, 1.7.4.17.2.15, 1.7.4.17.2.16 desire.tk, 1.1.2.277, 1.1.2.278

[Mathieu Bouchard]

Update of /cvsroot/pure-data/pd/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7186

Modified Files:
      Tag: devel_0_39
	s_main.c desire.tk 
Log Message:
fixed -lib and -open


Index: desire.tk
===================================================================
RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v
retrieving revision 1.1.2.277
retrieving revision 1.1.2.278
diff -C2 -d -r1.1.2.277 -r1.1.2.278
*** desire.tk	3 Jul 2006 19:53:18 -0000	1.1.2.277
--- desire.tk	3 Jul 2006 21:03:06 -0000	1.1.2.278
***************
*** 581,584 ****
--- 581,585 ----
  		global files_to_open
  		post "files_to_open='$files_to_open'"
+ 		pd pd init
  		foreach f $files_to_open {
  			set ff [file split [file normalize $f]]
***************
*** 730,734 ****
  def Client ddrc_editor {} {ClientPrefsDialog new_as ddrc}
  
- 
  proc menu_pop_pd {} {raise .}
  proc menu_audio {flag} {pd pd dsp $flag}
--- 731,734 ----

Index: s_main.c
===================================================================
RCS file: /cvsroot/pure-data/pd/src/s_main.c,v
retrieving revision 1.7.4.17.2.15
retrieving revision 1.7.4.17.2.16
diff -C2 -d -r1.7.4.17.2.15 -r1.7.4.17.2.16
*** s_main.c	16 Jun 2006 23:12:00 -0000	1.7.4.17.2.15
--- s_main.c	3 Jul 2006 21:03:06 -0000	1.7.4.17.2.16
***************
*** 215,218 ****
--- 215,246 ----
  open(), read(), etc, calls to be served somehow from the GUI too. */
  
+ #ifdef DESIRE
+ /* for DesireData this should be eventually nuked */
+ void glob_initfromgui(void *dummy, t_symbol *s, int argc, t_atom *argv)
+ {
+     char cwd[666];
+     getcwd(cwd,665);
+     t_namelist *nl;
+     /* load dynamic libraries specified with "-lib" args */
+     for  (nl = sys_externlist; nl; nl = nl->nl_next)
+         if (!sys_load_lib(cwd, nl->nl_string, 0))
+             post("%s: can't load library", nl->nl_string);
+     /* open patches specifies with "-open" args */
+     for  (nl = sys_openlist; nl; nl = nl->nl_next)
+         openit(cwd, nl->nl_string);
+     namelist_free(sys_openlist);
+     sys_openlist = 0;
+     /* send messages specified with "-send" args */
+     for (nl = sys_messagelist; nl; nl = nl->nl_next) {
+         t_binbuf *b = binbuf_new();
+         binbuf_text(b, nl->nl_string, strlen(nl->nl_string));
+         binbuf_eval(b, 0, 0, 0);
+         binbuf_free(b);
+     }
+     namelist_free(sys_messagelist);
+     sys_messagelist = 0;
+     sys_oldtclversion = atom_getfloatarg(1 + 3 * NHOSTFONT, argc, argv);
+ }
+ #else
  void glob_initfromgui(void *dummy, t_symbol *s, int argc, t_atom *argv)
  {
***************
*** 247,250 ****
--- 275,279 ----
          if (!sys_load_lib(cwd, nl->nl_string, 0))
              post("%s: can't load library", nl->nl_string);
+ 
          /* open patches specifies with "-open" args */
      for  (nl = sys_openlist; nl; nl = nl->nl_next)
***************
*** 264,267 ****
--- 293,297 ----
      sys_oldtclversion = atom_getfloatarg(1 + 3 * NHOSTFONT, argc, argv);
  }
+ #endif
  
  static void sys_afterargparse(void);