Changeset 3071

Show
Ignore:
Timestamp:
11/12/08 06:07:41 (1 year ago)
Author:
sletz
Message:

rebase from trunk 3061:3070

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • jack2/branches/solaris/ChangeLog

    r3062 r3071  
    26262008-10-30 Stephane Letz  <letz@grame.fr> 
    2727 
     28        * Correct JackClient::ShutDown. 
    2829        * TimeOut management in JackNetUnixSocket on Solaris. 
    2930        * Fix Midi port initialization in JackNetDriver. 
    …… 
    3637 
    3738        * In JackOSSDriver, vmix mode is used by default, exclusif (O_EXCL) mode can be selected with -e option. 
    38  
    39 2008-10-19 Stephane Letz  <letz@grame.fr> 
    40          
    4139        * Fix a crash in JackEngine::Close when backend cannot be loaded. 
    4240        * Tim Blechmann optimization patch. 

  • jack2/branches/solaris/common/JackClient.cpp

    r2976 r3071  
    598598    jack_log("ShutDown"); 
    599599     
    600     GetClientControl()->fServer = false; 
    601     GetClientControl()->fActive = false; 
     600    // Be sure client is already started  
     601    if (GetClientControl()) { 
     602        GetClientControl()->fServer = false; 
     603        GetClientControl()->fActive = false; 
     604    } 
    602605     
    603606    if (fShutdown) { 

  • jack2/branches/solaris/macosx/Jackdmp.xcodeproj/project.pbxproj

    r3029 r3071  
    508508                4BA692B30CBE4C2D00EAD520 /* ipload.c in Sources */ = {isa = PBXBuildFile; fileRef = 4BA692B20CBE4C2D00EAD520 /* ipload.c */; }; 
    509509                4BA692D70CBE4CC600EAD520 /* ipunload.c in Sources */ = {isa = PBXBuildFile; fileRef = 4BA692D60CBE4CC600EAD520 /* ipunload.c */; }; 
    510                 4BA7BDCC0DC22F4500AA3457 /* Jackservermp.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4BA7BDCB0DC22F4500AA3457 /* Jackservermp.framework */; }; 
    511                 4BA7BDCD0DC22F4500AA3457 /* Jackservermp.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4BA7BDCB0DC22F4500AA3457 /* Jackservermp.framework */; }; 
    512510                4BA7BDCE0DC22F4500AA3457 /* Jackservermp.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4BA7BDCB0DC22F4500AA3457 /* Jackservermp.framework */; }; 
    513511                4BA7BDCF0DC22F4500AA3457 /* Jackservermp.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4BA7BDCB0DC22F4500AA3457 /* Jackservermp.framework */; }; 
    …… 
    14691467                        files = ( 
    14701468                                4BCC87980D57168300A7FEB1 /* Accelerate.framework in Frameworks */, 
    1471                                 4BA7BDCC0DC22F4500AA3457 /* Jackservermp.framework in Frameworks */, 
    14721469                        ); 
    14731470                        runOnlyForDeploymentPostprocessing = 0; 
    …… 
    14781475                        files = ( 
    14791476                                4BCC87990D57168300A7FEB1 /* Accelerate.framework in Frameworks */, 
    1480                                 4BA7BDCD0DC22F4500AA3457 /* Jackservermp.framework in Frameworks */, 
    14811477                        ); 
    14821478                        runOnlyForDeploymentPostprocessing = 0; 

  • jack2/branches/solaris/windows/jackd.workspace

    r3024 r3071  
    22<CodeBlocks_workspace_file> 
    33        <Workspace title="jack"> 
    4                 <Project filename="libjackserver.cbp" active="1" /> 
     4                <Project filename="libjackserver.cbp" /> 
    55                <Project filename="jackd.cbp"> 
    66                        <Depends filename="libjackserver.cbp" /> 
    …… 
    4343                        <Depends filename="libjack.cbp" /> 
    4444                </Project> 
     45                <Project filename="jack_test.cbp" active="1" /> 
    4546        </Workspace> 
    4647</CodeBlocks_workspace_file>