* merged with mainline

[apt.git] / apt-pkg / acquire-worker.h

diff --git a/apt-pkg/acquire-worker.h b/apt-pkg/acquire-worker.h
index b0acde3e383b4e2b1f63cf8eafd5f66c524311ea..6e195220256b254374452f86e9f0b2e0eff30d0d 100644 (file)
--- a/apt-pkg/acquire-worker.h
+++ b/apt-pkg/acquire-worker.h
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
-// $Id: acquire-worker.h,v 1.5 1998/10/26 07:11:46 jgg Exp $
+// $Id: acquire-worker.h,v 1.12 2001/02/20 07:03:17 jgg Exp $
 /* ######################################################################
 
    Acquire Worker - Worker process manager
@@ -13,7 +13,6 @@
 #define PKGLIB_ACQUIRE_WORKER_H
 
 #include <apt-pkg/acquire.h>
-#include <apt-pkg/configuration.h>
 
 #ifdef __GNUG__
 #pragma interface "apt-pkg/acquire-worker.h"
@@ -22,10 +21,10 @@
 // Interfacing to the method process
 class pkgAcquire::Worker
 {
-   friend pkgAcquire;
+   friend class pkgAcquire;
    
    protected:
-   friend Queue;
+   friend class Queue;
 
    /* Linked list starting at a Queue and a linked list starting
       at Acquire */
@@ -34,9 +33,10 @@ class pkgAcquire::Worker
    
    // The access association
    Queue *OwnerQ;
+   pkgAcquireStatus *Log;
    MethodConfig *Config;
    string Access;
-      
+
    // This is the subprocess IPC setup
    pid_t Process;
    int InFd;
@@ -61,8 +61,10 @@ class pkgAcquire::Worker
    // The message handlers
    bool Capabilities(string Message);
    bool SendConfiguration();
-
+   bool MediaChange(string Message);
+   
    bool MethodFailure();
+   void ItemDone();
    
    public:
    
@@ -71,16 +73,17 @@ class pkgAcquire::Worker
    string Status;
    unsigned long CurrentSize;
    unsigned long TotalSize;
-
+   unsigned long ResumePoint;
+   
    // Load the method and do the startup 
    bool QueueItem(pkgAcquire::Queue::QItem *Item);
-   bool Start();   
+   bool Start();
+   void Pulse();
+   inline const MethodConfig *GetConf() const {return Config;};
    
-   Worker(Queue *OwnerQ,MethodConfig *Config);
+   Worker(Queue *OwnerQ,MethodConfig *Config,pkgAcquireStatus *Log);
    Worker(MethodConfig *Config);
    ~Worker();
 };
 
-bool pkgInjectConfiguration(string &Message,Configuration &Cnf);
-
 #endif